commit 8363faf9a885933aca2ced9bb1c6f9aa4a43c9f7
author Hyunyoung Song <hyunyoungs@google.com> Wed Jan 06 22:39:56 2016 +0000
committer Hyunyoung Song <hyunyoungs@google.com> Wed Jan 06 22:47:16 2016 +0000
tree ff91d297657cc7676dce6674e2fd5e13bb6c3d62
parent 4ae00b1b8e853f45770c833085179eb382220d78

[DO NOT MERGE] Revert "Fix broken make target launcher_protoutil_lib Bug:26406415"

In branch ub-launcher3-burnaby,
libprotobuf-java-2.3.0-nano can be linked, because the protobuf project is tracking lmp tree

In branch ub-launcher3-burnaby-polish,
libprotobuf-java-nano can be linked, because the
protobuf project is tracking master tree.

Hence the original CL should be reverted in ub-launcher3-burnaby tree but should not be merged automatically
to downstream trees.

This reverts commit 4ae00b1b8e853f45770c833085179eb382220d78.

Change-Id: I137756b79e2c12d36408073bdd6cddc773a4f168

Android.mk

diff --git a/Android.mk b/Android.mk
index b50765d..ec675c6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,7 +64,7 @@
 LOCAL_MODULE := launcher_protoutil_lib
 LOCAL_IS_HOST_MODULE := true
 LOCAL_JAR_MANIFEST := util/etc/manifest.txt
-LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-nano
+LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-2.3.0-nano
 
 include $(BUILD_HOST_JAVA_LIBRARY)