Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Switch libplatformproto to sharedlib"" into oc-dev

Browse Source
This commit is contained in:
Chris Craik
2017-04-04 17:16:33 +00:00
committed by Android (Google) Code Review
parent 2ac9698271 817b494739
commit eabb5621dd
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@@ -1460,8 +1460,7 @@ 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)
LOCAL_SHARED_LIBRARIES := libprotobuf-cpp-full include $(BUILD_STATIC_LIBRARY)
include $(BUILD_SHARED_LIBRARY)
# ==== c++ proto host library ============================== # ==== c++ proto host library ==============================
include $(CLEAR_VARS) include $(CLEAR_VARS)

4
libs/hwui/hwui_static_deps.mk
View File

@@ -27,5 +27,7 @@ LOCAL_SHARED_LIBRARIES += \
libft2 \ libft2 \
libminikin \ libminikin \
libandroidfw \ libandroidfw \
libRScpp \ libRScpp
LOCAL_STATIC_LIBRARIES += \
libplatformprotos libplatformprotos