diff options
| author | Ta-wei Yen <twyen@google.com> | 2016-02-23 22:01:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-23 22:01:07 +0000 |
| commit | c6d87e2b321155ce80979516d4eb7b8ea17af822 (patch) | |
| tree | 08e2c581e609313f1b6ffb5c45273ad1cd8e2762 | |
| parent | 6cdceed84c79ea80e22934540abc95c3fd13ead0 (diff) | |
| parent | 39ce0ebc87582185e9733aeda25a3f786cce9969 (diff) | |
Merge "Apply lower case project name convention" into nyc-dev
| -rw-r--r-- | InCallUI/build.gradle | 4 | ||||
| -rw-r--r-- | build-app.gradle | 6 | ||||
| -rw-r--r-- | build-library.gradle | 6 | ||||
| -rw-r--r-- | tools/gradle/settings.gradle | 15 |
4 files changed, 14 insertions, 17 deletions
diff --git a/InCallUI/build.gradle b/InCallUI/build.gradle index b55d46396..de4725199 100644 --- a/InCallUI/build.gradle +++ b/InCallUI/build.gradle @@ -9,6 +9,6 @@ android { dependencies { compile 'com.android.support:support-v4:23.1.+' - compile project(':PhoneCommon') - compile project(':ContactsCommon') + compile project(':phonecommon') + compile project(':contactscommon') } diff --git a/build-app.gradle b/build-app.gradle index ef019ed35..9e24136ae 100644 --- a/build-app.gradle +++ b/build-app.gradle @@ -28,7 +28,7 @@ dependencies { compile project(':jsr305') compile project(':vcard') - compile project(':ContactsCommon') - compile project(':InCallUI') - compile project(':PhoneCommon') + compile project(':contactscommon') + compile project(':incallui') + compile project(':phonecommon') } diff --git a/build-library.gradle b/build-library.gradle index f96ff2bec..d3530164f 100644 --- a/build-library.gradle +++ b/build-library.gradle @@ -28,7 +28,7 @@ dependencies { compile project(':jsr305') compile project(':vcard') - compile project(':ContactsCommon') - compile project(':InCallUI') - compile project(':PhoneCommon') + compile project(':contactscommon') + compile project(':incallui') + compile project(':phonecommon') } diff --git a/tools/gradle/settings.gradle b/tools/gradle/settings.gradle index 52541af38..24d5e33a9 100644 --- a/tools/gradle/settings.gradle +++ b/tools/gradle/settings.gradle @@ -46,18 +46,15 @@ project(':volley').buildFileName = 'rules.gradle' 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') |