diff options
| author | Matt Sarett <msarett@google.com> | 2015-12-03 18:14:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-03 18:14:21 +0000 |
| commit | 2377dfdca010a6ea60227301d3628a38bab471a6 (patch) | |
| tree | b06b6d599f94e86a3806dd073fa617c2201e33b3 | |
| parent | 7c53faed896b1aba9780e71d67a13a2d3b4dcfc8 (diff) | |
| parent | f9fa7cc5d8d1dc2db0d1eb9486438bb421b29699 (diff) | |
| download | libjpeg-turbo-2377dfdca010a6ea60227301d3628a38bab471a6.tar.gz | |
Merge "Change library module name to libjpeg"
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -83,7 +83,7 @@ ifneq (,$(TARGET_BUILD_APPS)) endif # Build as a static library. -LOCAL_MODULE := libjpeg-turbo_static +LOCAL_MODULE := libjpeg_static include $(BUILD_STATIC_LIBRARY) # Also build as a shared library. @@ -101,6 +101,6 @@ LOCAL_LDFLAGS_x86 += -Wl,--no-warn-shared-textrel LOCAL_LDFLAGS_x86_64 += -Wl,--no-warn-shared-textrel LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_WHOLE_STATIC_LIBRARIES = libjpeg-turbo_static -LOCAL_MODULE := libjpeg-turbo +LOCAL_WHOLE_STATIC_LIBRARIES = libjpeg_static +LOCAL_MODULE := libjpeg include $(BUILD_SHARED_LIBRARY) |