commit 088080ed9b183ef75ae1ed66ba4abcf7d1a7eba7
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jan 07 18:16:10 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 07 18:16:10 2019 +0000
tree 3dcaa75ab10734afb2fba938ca374118f8015aa4
parent b7ca2e6967e708b96da9c5b2f051a46d0ee082a7
parent ab87400b58ef0fc608af8c9aff250f12a50e3d62

Merge changes from topic "launcher3-gradle-fixes" into ub-launcher3-master

* changes:
  Fix Launcher3 gradle issue with src_plugins.
  Fix Launcher3 gradle src_shorcuts_overrides issue.

build.gradle

diff --git a/build.gradle b/build.gradle
index 33409c5..c1f373e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,7 +70,7 @@
     sourceSets {
         main {
             res.srcDirs = ['res']
-            java.srcDirs = ['src', 'src_shortcuts_overrides']
+            java.srcDirs = ['src', 'src_plugins']
             manifest.srcFile 'AndroidManifest-common.xml'
             proto {
                 srcDir 'protos/'
@@ -93,7 +93,7 @@
         }
 
         aosp {
-            java.srcDirs = ['src_flags', "src_ui_overrides"]
+            java.srcDirs = ['src_flags', "src_ui_overrides", 'src_shortcuts_overrides']
         }
 
         l3go {
@@ -104,7 +104,7 @@
 
         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"
         }
     }