commit 2385ebebee97b45adbddb9462dc4ad33fd4f7951
author Sunny Goyal <sunnygoyal@google.com> Wed Jul 19 01:24:07 2017 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Thu Jul 20 11:47:11 2017 -0700
tree a903b2abeb9da9dfd0db662a908cfd67afc99f9b
parent 6cd0e46a8ee384a5255b6189cd46ed694fcbecac

Adding support for derivative apps to safely extend LauncherLog proto

Bug: 37676962
Change-Id: I24716070841b41418ac57b8dc367278e3ebdd046

build.gradle

diff --git a/build.gradle b/build.gradle
index c23a299..79ee111 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,10 @@
             res.srcDirs = ['res']
             java.srcDirs = ['src', 'src_flags']
             manifest.srcFile 'AndroidManifest-common.xml'
-            proto.srcDirs 'protos/'
+            proto {
+                srcDir 'protos/'
+                srcDir 'proto_overrides/'
+            }
         }
 
         androidTest {
@@ -92,6 +95,7 @@
                 task.builtins {
                     remove java
                     javanano {
+                        option "java_package=launcher_log_extension.proto|com.android.launcher3.userevent.nano"
                         option "java_package=launcher_log.proto|com.android.launcher3.userevent.nano"
                         option "java_package=launcher_dump.proto|com.android.launcher3.model.nano"
                         option "enum_style=java"