Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30de7af5 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Remove host- prefix from protobuf libraries" am: 5e48a5c6 

am: 835bdf78

Change-Id: Ie5c4a240716fd2c1c1e3372977f2ca1f51ec1f3f
parents e952561e 835bdf78

core/host_java_library_common.mk

+4 −4
Original line number Diff line number Diff line
@@ -32,15 +32,15 @@ all_res_assets := 
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