commit db4012d8049251786be524c68d714d09c97e523a
author Jaekyun Seok <jaekyun@google.com> Tue Dec 13 01:22:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 13 01:22:13 2016 +0000
tree 7a0f93b7654d0cabd542932a8870e805ee8837fc
parent 25ab6f478696935cb1ebe0e60ac20b11b501bc21
parent fc5d6c50845bcc674f248ed743449e4d53c9cc68

Merge "Support shared lib for libyuv_static." am: 9caf0f58f0 am: d8af8efec0 am: 4979fb47e1
am: fc5d6c5084

Change-Id: Ia7e45bc47a7f71f29a1cb3078900bc5ebf0f9483

files/Android.mk

diff --git a/files/Android.mk b/files/Android.mk
index 20ed426..217114e 100644
--- a/files/Android.mk
+++ b/files/Android.mk
@@ -57,3 +57,11 @@
 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)