diff options
| author | Dan Albert <danalbert@google.com> | 2016-09-20 21:39:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-20 21:39:25 +0000 |
| commit | 0b1761413c6a7f1d478a486904e835c7c40c20c9 (patch) | |
| tree | e4499dce6a8ce497b95cf91f309035515db7cc7a | |
| parent | 012ad4dc9b94691bc3b2dfa09005e94dcd620f25 (diff) | |
| parent | 1fb32ac5f0d4409fa99498156008fce53b8ce167 (diff) | |
| download | dng_sdk-0b1761413c6a7f1d478a486904e835c7c40c20c9.tar.gz | |
Move libdng_sdk_validate over to the NDK. am: 7d8c63ff5a am: b5804e1d5c am: 4742b11a4b
am: 1fb32ac5f0
Change-Id: I5975ea23fbf9d71ef930ad3f84e62cea70f0c4b3
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -123,17 +123,15 @@ LOCAL_CFLAGS += -Wno-ignored-qualifiers LOCAL_CLANG := true LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow -LOCAL_STATIC_LIBRARIES := libz libjpeg_static +LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk +LOCAL_SHARED_LIBRARIES := libz LOCAL_CPP_FEATURES := rtti exceptions LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/source # NDK build, shared C++ runtime -# LOCAL_SDK_VERSION := current -# LOCAL_NDK_STL_VARIANT := c++_shared - -# Temporary workaround until camera2 NDK is active. See b/27102995. -LOCAL_CXX_STL := libc++_static +LOCAL_SDK_VERSION := 24 +LOCAL_NDK_STL_VARIANT := c++_shared include $(BUILD_STATIC_LIBRARY) |