diff options
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | libs/hwui/hwui_static_deps.mk | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 8daab8ff800e..eb649c9152c3 100644 --- a/Android.mk +++ b/Android.mk @@ -1460,7 +1460,8 @@ LOCAL_PROTOC_FLAGS := \ LOCAL_SRC_FILES := \ $(call all-proto-files-under, core/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 ============================== include $(CLEAR_VARS) diff --git a/libs/hwui/hwui_static_deps.mk b/libs/hwui/hwui_static_deps.mk index 8826cfcc3100..7f06421b02a0 100644 --- a/libs/hwui/hwui_static_deps.mk +++ b/libs/hwui/hwui_static_deps.mk @@ -27,7 +27,5 @@ LOCAL_SHARED_LIBRARIES += \ libft2 \ libminikin \ libandroidfw \ - libRScpp - -LOCAL_STATIC_LIBRARIES += \ + libRScpp \ libplatformprotos |