diff options
| author | Brian Carlstrom <bdc@google.com> | 2016-01-13 10:36:17 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2016-01-13 11:45:43 -0800 |
| commit | b4c60ce9452674a935dfe6b8ffdff5f58cf16173 (patch) | |
| tree | 796b7e9be0a225e772efa1c86a2de7870ea4ed37 | |
| parent | 992853c59abbd07f24571537f5b7f76a9c9e237e (diff) | |
| download | libpng-b4c60ce9452674a935dfe6b8ffdff5f58cf16173.tar.gz | |
Add libpng_ndk variant
Bug: 26513978
Change-Id: Ib4aa2276159d27414c7a8303556ae2646fbf4016
| -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) |