diff options
| author | Trevor Drake <trevordrake.gerrit@gmail.com> | 2014-12-06 00:07:05 +0000 |
|---|---|---|
| committer | Trevor Drake <trevordrake.gerrit@gmail.com> | 2014-12-06 00:07:05 +0000 |
| commit | f73237346e84a0247afb0f212e3a5df3984656dc (patch) | |
| tree | 3728500ee06cfd5a3e9c651ae802300bab8d5598 /libziparchive | |
| parent | 862e4d5b98f8777b7a968e60e838a9d9bab5445c (diff) | |
| download | system_core-f73237346e84a0247afb0f212e3a5df3984656dc.zip system_core-f73237346e84a0247afb0f212e3a5df3984656dc.tar.gz system_core-f73237346e84a0247afb0f212e3a5df3984656dc.tar.bz2 | |
Clean up libziparchive Android.mk
Removed LOCAL_C_INCLUDES which are no longer necessary as zlib
now uses the LOCAL_EXPORT_C_INCLUDE_DIRS mechanism.
Removed a couple of redundant LOCAL_MODULE entries
Tested compiling some of the projects that make use of libziparchive
and libziparchive-host using a clean out dir with aosp_flounder-userdebug
aosp_arm-eng targets
make -j3 libziparchive libandroidfw libartd libart libjavacore libjavacoretests aapt
Change-Id: I2988f1b3a62d1df2b5eada4ad39a9246ac1184fb
Diffstat (limited to 'libziparchive')
| -rw-r--r-- | libziparchive/Android.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk index 9bc6e61..842dab7 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk @@ -16,7 +16,6 @@ LOCAL_PATH := $(call my-dir) source_files := zip_archive.cc -includes := external/zlib include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -25,16 +24,13 @@ LOCAL_SRC_FILES := ${source_files} LOCAL_STATIC_LIBRARIES := libz LOCAL_SHARED_LIBRARIES := libutils LOCAL_MODULE:= libziparchive -LOCAL_C_INCLUDES += ${includes} LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_MODULE := libziparchive LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := ${source_files} -LOCAL_C_INCLUDES += ${includes} LOCAL_STATIC_LIBRARIES := libz libutils LOCAL_MODULE:= libziparchive-host LOCAL_CFLAGS := -Werror @@ -46,10 +42,8 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_MODULE := libziparchive LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := ${source_files} -LOCAL_C_INCLUDES += ${includes} LOCAL_STATIC_LIBRARIES := libz libutils LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE:= libziparchive-host |