diff options
| author | Kevin <kevhan@google.com> | 2019-01-04 15:52:46 -0800 |
|---|---|---|
| committer | Kevin <kevhan@google.com> | 2019-01-04 15:54:41 -0800 |
| commit | eea6ab9c16ccd31839c210cab53ef149970ec3cc (patch) | |
| tree | f7a3c01dbed4191d250a2f24f299adaf2e461a4e /build.gradle | |
| parent | efb8b836660bd367744c406b1a3ce7f20561e000 (diff) | |
| download | android_packages_apps_Trebuchet-eea6ab9c16ccd31839c210cab53ef149970ec3cc.tar.gz android_packages_apps_Trebuchet-eea6ab9c16ccd31839c210cab53ef149970ec3cc.tar.bz2 android_packages_apps_Trebuchet-eea6ab9c16ccd31839c210cab53ef149970ec3cc.zip | |
Fix Launcher3 gradle src_shorcuts_overrides issue.
This fixes an issue with l3go variant not building due to duplicate
classes. This ensures that l3go does not pull the
src_shortcuts_overrides src as it overrides it.
Test: Build APK for l3go variant in IDE
Change-Id: Id2b10035b30eaf8f677913c85e384569ecc78359
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 33409c5d0..738ce33b1 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ android { sourceSets { main { res.srcDirs = ['res'] - java.srcDirs = ['src', 'src_shortcuts_overrides'] + java.srcDirs = ['src'] manifest.srcFile 'AndroidManifest-common.xml' proto { srcDir 'protos/' @@ -93,7 +93,7 @@ android { } aosp { - java.srcDirs = ['src_flags', "src_ui_overrides"] + java.srcDirs = ['src_flags', "src_ui_overrides", 'src_shortcuts_overrides'] } l3go { @@ -104,7 +104,7 @@ android { quickstep { res.srcDirs = ['quickstep/res'] - java.srcDirs = ['src_flags', 'quickstep/src'] + java.srcDirs = ['src_flags', 'quickstep/src', 'src_shortcuts_overrides'] manifest.srcFile "quickstep/AndroidManifest.xml" } } |