diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2016-03-08 14:32:12 -0800 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2016-03-08 16:53:16 -0800 |
commit | 48416beb7a23402c60da61af74e6ab5e537be723 (patch) | |
tree | c0b273f889bde1fac4e65931959862bb8fb7ab57 | |
parent | 7841298310de58d0cddb212ac6295d9a27cf547c (diff) | |
download | dng_sdk-48416beb7a23402c60da61af74e6ab5e537be723.tar.gz |
Add static, validating variant of dng_sdk library
This is needed for Android CTS to be able to use dng_sdk to validate
captured DNG images.
Bug: 23727371
Change-Id: I7f9293f01574944973e306aa8d4d0b0768aff449
-rw-r--r-- | Android.mk | 49 |
1 files changed, 47 insertions, 2 deletions
@@ -73,10 +73,15 @@ dng_sdk_files := \ source/dng_xmp.cpp LOCAL_MODULE := libdng_sdk -LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(dng_sdk_files) -LOCAL_CFLAGS := -DUNIX_ENV=1 -DqDNGBigEndian=0 -DqDNGThreadSafe=1 -DqDNGUseLibJPEG=1 -DqDNGUseXMP=0 -DqDNGValidate=0 -DqDNGValidateTarget=1 -DqAndroid=1 -fexceptions -Wsign-compare -Wno-reorder -Wframe-larger-than=20000 -frtti +LOCAL_CFLAGS := \ + -DUNIX_ENV=1 -DqDNGBigEndian=0 -DqDNGThreadSafe=1 \ + -DqDNGUseLibJPEG=1 -DqDNGUseXMP=0 -DqDNGValidate=0 \ + -DqDNGValidateTarget=1 -DqAndroid=1 \ + -Wsign-compare -Wno-reorder -Wframe-larger-than=20000 + +LOCAL_CPPFLAGS := -frtti -fexceptions # Ignore unused parameters. LOCAL_CFLAGS += -Wno-unused-parameter @@ -92,6 +97,46 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/source include $(BUILD_SHARED_LIBRARY) +# dng sdk validating version static library +# This version will print out validation warnings/errors to stderr +# and is built against the NDK for use with CTS +# ======================================================== + +include $(CLEAR_VARS) + +LOCAL_MODULE := libdng_sdk_validate +LOCAL_SRC_FILES := $(dng_sdk_files) + +LOCAL_CFLAGS := \ + -DUNIX_ENV=1 -DqDNGBigEndian=0 -DqDNGThreadSafe=1 \ + -DqDNGUseLibJPEG=1 -DqDNGUseXMP=0 -DqDNGValidate=1 \ + -DqDNGValidateTarget=1 -DqAndroid=1 \ + -Wsign-compare -Wno-reorder -Wframe-larger-than=20000 + +LOCAL_CPPFLAGS := -frtti -fexceptions + +# Ignore unused parameters. +LOCAL_CFLAGS += -Wno-unused-parameter +# Some integral return types are annotated with "const." +LOCAL_CFLAGS += -Wno-ignored-qualifiers + +LOCAL_CLANG := true +LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow + +LOCAL_STATIC_LIBRARIES := libz libjpeg_static + +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 + +include $(BUILD_STATIC_LIBRARY) + # dng sdk unittests for target # ======================================================== |