aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaekyun Seok <jaekyun@google.com>2016-12-12 15:58:05 +0900
committerJaekyun Seok <jaekyun@google.com>2016-12-12 16:06:44 +0900
commit7732e805060ed524e6f721977bfdb6d4687f8e68 (patch)
treedd6366793fc21400d3b1a9313e09b9475269cd75
parenta4346dd79698a1b90736916ab0eda57bb9c0a904 (diff)
downloadlibyuv-7732e805060ed524e6f721977bfdb6d4687f8e68.tar.gz
Support shared lib for libyuv_static.
Some venders want to link libyuv_static to their components. And the Android Treble project recommends to use shared lib for easy update and size reduction. So we need to support shared lib for libyuv_static for such vendors. Test: building succeeded. Bug: 33056637 Change-Id: I68408470a16ad591ce83ee9265db6388caaa1199
-rw-r--r--files/Android.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/files/Android.mk b/files/Android.mk
index a13a1706..86e65f6d 100644
--- a/files/Android.mk
+++ b/files/Android.mk
@@ -57,3 +57,11 @@ LOCAL_MODULE := libyuv_static
LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libyuv_static
+LOCAL_MODULE := libyuv
+LOCAL_SHARED_LIBRARIES := libjpeg
+
+include $(BUILD_SHARED_LIBRARY)