Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6d87e2b authored by Ta-wei Yen's avatar Ta-wei Yen Committed by Android (Google) Code Review
Browse files

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

parents 6cdceed8 39ce0ebc

InCallUI/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -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')

}

build-app.gradle

+3 −3
Original line number Diff line number Diff line
@@ -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')

}

build-library.gradle

+3 −3
Original line number Diff line number Diff line
@@ -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')

}

tools/gradle/settings.gradle

+6 −9
Original line number Diff line number Diff line
@@ -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')