diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-07-19 01:24:07 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2017-07-20 11:47:11 -0700 |
| commit | 2385ebebee97b45adbddb9462dc4ad33fd4f7951 (patch) | |
| tree | a903b2abeb9da9dfd0db662a908cfd67afc99f9b /build.gradle | |
| parent | 6cd0e46a8ee384a5255b6189cd46ed694fcbecac (diff) | |
| download | android_packages_apps_Trebuchet-2385ebebee97b45adbddb9462dc4ad33fd4f7951.tar.gz android_packages_apps_Trebuchet-2385ebebee97b45adbddb9462dc4ad33fd4f7951.tar.bz2 android_packages_apps_Trebuchet-2385ebebee97b45adbddb9462dc4ad33fd4f7951.zip | |
Adding support for derivative apps to safely extend LauncherLog proto
Bug: 37676962
Change-Id: I24716070841b41418ac57b8dc367278e3ebdd046
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle index c23a29920..79ee111f5 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,10 @@ android { 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 @@ protobuf { 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" |