From 85aee73e98118e68c13c17dbef26b3b73dcaec40 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 8 Sep 2017 21:26:31 -0700 Subject: aapt: Always use our libz Instead of using the system libz (-lz), include our copy as a static library. This is safer in case the system version isn't compatible. Also removes references to -ldl -lrt -lpthread, which are now implied. Test: m -j Test: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests Test: out/host/linux-x86/nativetest64/aapt2_tests/aapt2_tests Test: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests Change-Id: Icd26dc1e0d011e5b5f158e562640533c5ac34e33 --- tools/split-select/Android.mk | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'tools/split-select') diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk index 4a1511eae43a..a21383ed4b6c 100644 --- a/tools/split-select/Android.mk +++ b/tools/split-select/Android.mk @@ -40,7 +40,6 @@ testSources := \ TestRules.cpp cIncludes := \ - external/zlib \ frameworks/base/tools hostStaticLibs := \ @@ -52,18 +51,11 @@ hostStaticLibs := \ libcutils \ libexpat \ libziparchive \ - libbase + libbase \ + libz cFlags := -Wall -Werror -hostLdLibs_linux := -lrt -ldl -lpthread - -# Statically link libz for MinGW (Win SDK under Linux), -# and dynamically link for all others. -hostStaticLibs_windows := libz -hostLdLibs_darwin := -lz -hostLdLibs_linux += -lz - # ========================================================== # Build the host static library: libsplit-select @@ -91,9 +83,6 @@ LOCAL_SRC_FILES := $(testSources) LOCAL_C_INCLUDES := $(cIncludes) LOCAL_STATIC_LIBRARIES := libsplit-select $(hostStaticLibs) -LOCAL_STATIC_LIBRARIES_windows := $(hostStaticLibs_windows) -LOCAL_LDLIBS_darwin := $(hostLdLibs_darwin) -LOCAL_LDLIBS_linux := $(hostLdLibs_linux) LOCAL_CFLAGS := $(cFlags) include $(BUILD_HOST_NATIVE_TEST) @@ -109,9 +98,6 @@ LOCAL_SRC_FILES := $(main) LOCAL_C_INCLUDES := $(cIncludes) LOCAL_STATIC_LIBRARIES := libsplit-select $(hostStaticLibs) -LOCAL_STATIC_LIBRARIES_windows := $(hostStaticLibs_windows) -LOCAL_LDLIBS_darwin := $(hostLdLibs_darwin) -LOCAL_LDLIBS_linux := $(hostLdLibs_linux) LOCAL_CFLAGS := $(cFlags) include $(BUILD_HOST_EXECUTABLE) -- cgit v1.2.3-59-g8ed1b