diff options
| author | Brian Carlstrom <bdc@google.com> | 2016-01-14 05:05:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 05:05:17 +0000 |
| commit | 27891849287a1bbc726ec81a29b6d72eae26f6e3 (patch) | |
| tree | 7da5771f2b9f6498aa52286b8d60bd70b394bffb | |
| parent | 1e37207adaaab370dcf2b78c7fef9a93ccf5b54d (diff) | |
| parent | dfa9650494e1b69740e434b9e035d8954a8c4d09 (diff) | |
| download | libpng-27891849287a1bbc726ec81a29b6d72eae26f6e3.tar.gz | |
Merge "Add libpng_ndk variant"android-wear-n-preview-3android-wear-n-preview-1android-n-preview-4android-n-preview-3android-n-preview-2
am: dfa9650494
* commit 'dfa9650494e1b69740e434b9e035d8954a8c4d09':
Add libpng_ndk variant
| -rw-r--r-- | Android.mk | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index e96c2242c..7745eb0bf 100644 --- a/Android.mk +++ b/Android.mk @@ -48,7 +48,26 @@ LOCAL_MODULE_HOST_OS := darwin linux windows include $(BUILD_HOST_STATIC_LIBRARY) -# For the device (static) +# For the device (static) for NDK +# ===================================================== + +include $(CLEAR_VARS) +LOCAL_CLANG := true +LOCAL_SRC_FILES := $(common_SRC_FILES) +LOCAL_CFLAGS += $(common_CFLAGS) -ftrapv +LOCAL_CFLAGS_arm := $(my_cflags_arm) +LOCAL_ASFLAGS += $(common_ASFLAGS) +LOCAL_SRC_FILES_arm := $(my_src_files_arm) +LOCAL_CFLAGS_arm64 := $(my_cflags_arm64) +LOCAL_SRC_FILES_arm64 := $(my_src_files_arm) +LOCAL_SANITIZE := never +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_SHARED_LIBRARIES := libz +LOCAL_MODULE:= libpng_ndk +LOCAL_SDK_VERSION := 14 +include $(BUILD_STATIC_LIBRARY) + +# For the device (static) for platform (retains fortify support) # ===================================================== include $(CLEAR_VARS) |