PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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 4ae00b1b8e.

Change-Id: I137756b79e2c12d36408073bdd6cddc773a4f168
This commit is contained in:
Hyunyoung Song
2016-01-06 22:39:56 +00:00
parent 4ae00b1b8e
commit 8363faf9a8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+1 -1
View File
@@ -64,7 +64,7 @@ LOCAL_MODULE_TAGS := optional
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)