diff options
| author | Stephen Hines <srhines@google.com> | 2013-06-26 15:15:33 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-06-26 17:17:28 -0700 |
| commit | b5e7fb4c103b3898cb78e9f7615cf7893626a5e9 (patch) | |
| tree | fd3fa1eebb1361f48bd940566ca4cce272ec32e3 | |
| parent | deba48b32d593851724bdce88dd9b754c4722645 (diff) | |
| download | libpng-kitkat-cts-release.tar.gz | |
Provide a shared library version of libpng for on-device linking.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devidea133
Bug: 9593270
This change also switches pngtest to use the actual shared library (and not
recompile all of the files another time as one giant blob).
Change-Id: I57ce13de31dd4973f47896cd5d056badf4a8c4db
| -rw-r--r-- | Android.mk | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index de76dd643..598a87ade 100644 --- a/Android.mk +++ b/Android.mk @@ -55,7 +55,23 @@ LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) include $(BUILD_HOST_STATIC_LIBRARY) -# For the device +# For the device (static) +# ===================================================== + +include $(CLEAR_VARS) +LOCAL_CLANG := true +LOCAL_SRC_FILES := $(common_SRC_FILES) +LOCAL_CFLAGS += $(common_CFLAGS) -ftrapv +LOCAL_C_INCLUDES += $(common_C_INCLUDES) \ + external/zlib +LOCAL_SHARED_LIBRARIES := \ + libz + +LOCAL_MODULE:= libpng + +include $(BUILD_STATIC_LIBRARY) + +# For the device (shared) # ===================================================== include $(CLEAR_VARS) @@ -72,15 +88,16 @@ LOCAL_MODULE:= libpng LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) # For testing # ===================================================== include $(CLEAR_VARS) +LOCAL_CLANG := true LOCAL_C_INCLUDES:= $(common_C_INCLUDES) external/zlib -LOCAL_SRC_FILES:= $(common_SRC_FILES) pngtest.c +LOCAL_SRC_FILES:= pngtest.c LOCAL_MODULE := pngtest -LOCAL_SHARED_LIBRARIES:= libz +LOCAL_SHARED_LIBRARIES:= libpng libz LOCAL_MODULE_TAGS := debug include $(BUILD_EXECUTABLE) |