aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2016-12-13 00:39:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-12-13 00:39:35 +0000
commit9caf0f58f0fc10b99021e9b29ab3e6ba915be45c (patch)
treedd6366793fc21400d3b1a9313e09b9475269cd75
parenta4346dd79698a1b90736916ab0eda57bb9c0a904 (diff)
parent7732e805060ed524e6f721977bfdb6d4687f8e68 (diff)
downloadlibyuv-9caf0f58f0fc10b99021e9b29ab3e6ba915be45c.tar.gz
Merge "Support shared lib for libyuv_static."android-n-mr2-preview-1
-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)