Commit 8363faf9 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

[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 4ae00b1b.

Change-Id: I137756b79e2c12d36408073bdd6cddc773a4f168
parent 4ae00b1b
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment