commit 1ef74f5151e24d6b0cfcd3faf2c4cc2bdf7ae35c
author Sunny Goyal <sunnygoyal@google.com> Thu Nov 10 00:50:22 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 10 00:50:22 2016 +0000
tree a703cf47e54306c47bd846112bf761ce133d48c2
parent 4ece6ed261b13f535618845552926bfd65a67be6
parent f0ba8b7ca1dc8fd53451d3d16e9f4fc306cddcd4

Merge "Moving various runnables in LauncherModel to individual tasks" into ub-launcher3-master

build.gradle

diff --git a/build.gradle b/build.gradle
index 6fccb5c..4629caa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,7 +84,7 @@
                 task.builtins {
                     remove java
                     javanano {
-                        option 'ignore_services=false'
+                        option "java_package=launcher_log.proto|com.android.launcher3.userevent.nano"
                     }
                 }
             }

protos/launcher_log.proto

diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto
index 448cf64..6b27559 100644
--- a/protos/launcher_log.proto
+++ b/protos/launcher_log.proto
@@ -15,7 +15,7 @@
  */
 syntax = "proto2";
 
-option java_package = "com.android.launcher3.userevent.nano";
+option java_package = "com.android.launcher3.userevent";
 option java_outer_classname = "LauncherLogProto";
 
 package userevent;