diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-04 07:21:07 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-04 07:21:07 +0000 |
| commit | c7ca27b373656861da4deb1d97e2cc6884744305 (patch) | |
| tree | f291bdff45930a0738e09ec6b74eb118b05c2113 | |
| parent | 28c0415a78bbed8e9f3cb6ce167be4ef147e5955 (diff) | |
| parent | b4940cde976a994f9909878e6218d6f94901cb4d (diff) | |
| download | ImageMagick-android-9.0.0_r48.tar.gz | |
Snap for 4698807 from b4940cde976a994f9909878e6218d6f94901cb4d to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1pie-vts-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: Ie56c8d1e07eba71ee776676e8ee3e71b5d55e30d
| -rw-r--r-- | Magick++/Android.mk | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/Magick++/Android.mk b/Magick++/Android.mk index 4fd87a542..77ee5d003 100644 --- a/Magick++/Android.mk +++ b/Magick++/Android.mk @@ -14,15 +14,8 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := Magick++ - -LOCAL_SDK_VERSION := 24 - -LOCAL_NDK_STL_VARIANT := c++_static - -LOCAL_SRC_FILES := lib/Blob.cpp\ +define define-magick++-vars + $(eval LOCAL_SRC_FILES := lib/Blob.cpp\ lib/BlobRef.cpp\ lib/CoderInfo.cpp\ lib/Color.cpp\ @@ -39,20 +32,33 @@ LOCAL_SRC_FILES := lib/Blob.cpp\ lib/STL.cpp\ lib/Statistic.cpp\ lib/Thread.cpp\ - lib/TypeMetric.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/lib - -LOCAL_CFLAGS += -DHAVE_CONFIG_H \ + lib/TypeMetric.cpp) \ + $(eval LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ + $(LOCAL_PATH)/lib) \ + $(eval LOCAL_CFLAGS += -DHAVE_CONFIG_H \ -Wall -Werror \ -Wno-deprecated-register \ - -Wno-unused-private-field + -Wno-unused-private-field) \ + $(eval LOCAL_CPPFLAGS += -fexceptions) \ + $(eval LOCAL_EXPORT_C_INCLUDE_DIRS := \ + external/ImageMagick/Magick++/lib \ + external/ImageMagick) +endef -LOCAL_CPPFLAGS += -fexceptions +include $(CLEAR_VARS) -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - external/ImageMagick/Magick++/lib \ - external/ImageMagick +$(call define-magick++-vars) +LOCAL_MODULE := Magick++_platform +LOCAL_CXX_STL := libc++_static + +include $(BUILD_STATIC_LIBRARY) + + +include $(CLEAR_VARS) + +$(call define-magick++-vars) +LOCAL_MODULE := Magick++ +LOCAL_SDK_VERSION := 24 +LOCAL_NDK_STL_VARIANT := c++_static include $(BUILD_STATIC_LIBRARY) |