commit 615212e1a2c4c08bbd11c851861f98de30451899
author Colin Cross <ccross@android.com> Thu Oct 25 14:45:39 2018 -0700
committer Colin Cross <ccross@android.com> Fri Oct 26 23:55:49 2018 -0700
tree eaf56f94a68afd78509aa601f4234e328e90ee5f
parent e0006c91cac7c5d3b08b17b718d43ee1cac79a29

Remove host- prefix from protobuf libraries

Test: m checkbuild
Change-Id: I3e7e5f22a5becd2f37db89b6681ff21737b29267

core/host_java_library_common.mk

diff --git a/core/host_java_library_common.mk b/core/host_java_library_common.mk
index 8df4b37..0e62f60 100644
--- a/core/host_java_library_common.mk
+++ b/core/host_java_library_common.mk
@@ -32,15 +32,15 @@
 proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))
 ifneq ($(proto_sources),)
 ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
-    LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-micro
+    LOCAL_JAVA_LIBRARIES += libprotobuf-java-micro
 else
   ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
-    LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-nano
+    LOCAL_JAVA_LIBRARIES += libprotobuf-java-nano
   else
     ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)
-      LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-full
+      LOCAL_JAVA_LIBRARIES += libprotobuf-java-full
     else
-      LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-lite
+      LOCAL_JAVA_LIBRARIES += libprotobuf-java-lite
     endif
   endif
 endif