| commit | d8af8efec0fbcd27f8a452e901efa39b5434ff49 | [log] [tgz] |
|---|---|---|
| author | Jaekyun Seok <jaekyun@google.com> | Tue Dec 13 00:46:39 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 13 00:46:39 2016 +0000 |
| tree | dd6366793fc21400d3b1a9313e09b9475269cd75 | |
| parent | a4346dd79698a1b90736916ab0eda57bb9c0a904 [diff] | |
| parent | 9caf0f58f0fc10b99021e9b29ab3e6ba915be45c [diff] |
Merge "Support shared lib for libyuv_static." am: 9caf0f58f0 Change-Id: I28c645463c271f752dd2ddb1aae2b9c980a33668
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)