commit c6d87e2b321155ce80979516d4eb7b8ea17af822
author Ta-wei Yen <twyen@google.com> Tue Feb 23 22:01:07 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 23 22:01:07 2016 +0000
tree 08e2c581e609313f1b6ffb5c45273ad1cd8e2762
parent 6cdceed84c79ea80e22934540abc95c3fd13ead0
parent 39ce0ebc87582185e9733aeda25a3f786cce9969

Merge "Apply lower case project name convention" into nyc-dev

InCallUI/build.gradle

diff --git a/InCallUI/build.gradle b/InCallUI/build.gradle
index b55d463..de47251 100644
--- a/InCallUI/build.gradle
+++ b/InCallUI/build.gradle
@@ -9,6 +9,6 @@
 
 dependencies {
     compile 'com.android.support:support-v4:23.1.+'
-    compile project(':PhoneCommon')
-    compile project(':ContactsCommon')
+    compile project(':phonecommon')
+    compile project(':contactscommon')
 }

build-app.gradle

diff --git a/build-app.gradle b/build-app.gradle
index ef019ed..9e24136 100644
--- a/build-app.gradle
+++ b/build-app.gradle
@@ -28,7 +28,7 @@
     compile project(':jsr305')
     compile project(':vcard')
 
-    compile project(':ContactsCommon')
-    compile project(':InCallUI')
-    compile project(':PhoneCommon')
+    compile project(':contactscommon')
+    compile project(':incallui')
+    compile project(':phonecommon')
 }

build-library.gradle

diff --git a/build-library.gradle b/build-library.gradle
index f96ff2b..d353016 100644
--- a/build-library.gradle
+++ b/build-library.gradle
@@ -28,7 +28,7 @@
     compile project(':jsr305')
     compile project(':vcard')
 
-    compile project(':ContactsCommon')
-    compile project(':InCallUI')
-    compile project(':PhoneCommon')
+    compile project(':contactscommon')
+    compile project(':incallui')
+    compile project(':phonecommon')
 }

tools/gradle/settings.gradle

diff --git a/tools/gradle/settings.gradle b/tools/gradle/settings.gradle
index 52541af..24d5e33 100644
--- a/tools/gradle/settings.gradle
+++ b/tools/gradle/settings.gradle
@@ -46,18 +46,15 @@
 include 'vcard'
 project(':vcard').projectDir = new File(rootDir, 'frameworks/opt/vcard')
 
-include 'PhoneCommon'
-project(':PhoneCommon').projectDir = new File(rootDir, 'packages/apps/PhoneCommon')
+include 'phonecommon'
+project(':phonecommon').projectDir = new File(rootDir, 'packages/apps/PhoneCommon')
 
-include 'ContactsCommon'
-project(':ContactsCommon').projectDir = new File(rootDir, 'packages/apps/ContactsCommon')
+include 'contactscommon'
+project(':contactscommon').projectDir = new File(rootDir, 'packages/apps/ContactsCommon')
 
-include 'InCallUI'
-project(':InCallUI').projectDir = new File(rootDir, 'packages/apps/Dialer/InCallUI')
+include 'incallui'
+project(':incallui').projectDir = new File(rootDir, 'packages/apps/Dialer/InCallUI')
 
 include 'dialer'
 project(':dialer').projectDir = new File(rootDir, 'packages/apps/Dialer')
 project(':dialer').buildFileName = 'build-app.gradle'
-
-include 'googledialer'
-project(':googledialer').projectDir = new File(rootDir, 'vendor/unbundled_google/packages/GoogleDialer')