openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Kevin 2019-01-04 15:52:46 -08:00
parent efb8b83666
commit eea6ab9c16
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -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"
}
}