Merge "Switch libplatformproto to sharedlib" into oc-dev
am: 72c2760943
Change-Id: I534c8d890499dbd7fbe456fa407b10e34d2a5eb3
This commit is contained in:
@ -1461,7 +1461,8 @@ LOCAL_PROTOC_FLAGS := \
|
|||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
$(call all-proto-files-under, core/proto) \
|
$(call all-proto-files-under, core/proto) \
|
||||||
$(call all-proto-files-under, libs/incident/proto)
|
$(call all-proto-files-under, libs/incident/proto)
|
||||||
include $(BUILD_STATIC_LIBRARY)
|
LOCAL_SHARED_LIBRARIES := libprotobuf-cpp-full
|
||||||
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
||||||
# ==== c++ proto host library ==============================
|
# ==== c++ proto host library ==============================
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
@ -27,7 +27,5 @@ LOCAL_SHARED_LIBRARIES += \
|
|||||||
libft2 \
|
libft2 \
|
||||||
libminikin \
|
libminikin \
|
||||||
libandroidfw \
|
libandroidfw \
|
||||||
libRScpp
|
libRScpp \
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES += \
|
|
||||||
libplatformprotos
|
libplatformprotos
|
||||||
|
Reference in New Issue
Block a user