drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch libplatformproto to sharedlib" into oc-dev

Browse Source 
am: 72c2760943

Change-Id: I534c8d890499dbd7fbe456fa407b10e34d2a5eb3
This commit is contained in:
John Reck
2017-03-30 16:57:51 +00:00
committed by android-build-merger
parent 1f3f5955bb 72c2760943
commit af39ba5d49
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@ -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)

4
libs/hwui/hwui_static_deps.mk
View File

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