From f73237346e84a0247afb0f212e3a5df3984656dc Mon Sep 17 00:00:00 2001 From: Trevor Drake Date: Sat, 6 Dec 2014 00:07:05 +0000 Subject: 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 --- libziparchive/Android.mk | 6 ------ 1 file changed, 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 -- cgit v1.1