commit fc5d6c50845bcc674f248ed743449e4d53c9cc68
author Jaekyun Seok <jaekyun@google.com> Tue Dec 13 01:03:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 13 01:03:08 2016 +0000
tree dd6366793fc21400d3b1a9313e09b9475269cd75
parent a4346dd79698a1b90736916ab0eda57bb9c0a904
parent 4979fb47e1562029a15e60d6dda184266f8af8af

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

Change-Id: Icf6fca5343fae71abe42421419611eddd1484639

files/Android.mk

diff --git a/files/Android.mk b/files/Android.mk
index a13a170..86e65f6 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)