commit dd2fe64c64c0d54531b22096f1db66aa332b2476
author Elliott Hughes <enh@google.com> Fri Dec 12 20:22:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 12 20:22:28 2014 +0000
tree 06c084bae9d7eee99b78bac5eee4716dc8c015a0
parent 4a8a72314ca6ff82397b768e3fdb7ca0b1390c81
parent 1f5cad5b8bb4ec7c3d63ee8b4c5863d883cd07d3

am 1f5cad5b: Merge "Cleanup libsparse Android.mk"

* commit '1f5cad5b8bb4ec7c3d63ee8b4c5863d883cd07d3':
  Cleanup libsparse Android.mk

libsparse/Android.mk

diff --git a/libsparse/Android.mk b/libsparse/Android.mk
index 0abe33d..925b98b 100644
--- a/libsparse/Android.mk
+++ b/libsparse/Android.mk
@@ -16,7 +16,7 @@
 LOCAL_SRC_FILES := $(libsparse_src_files)
 LOCAL_MODULE := libsparse_host
 LOCAL_STATIC_LIBRARIES := libz
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_CFLAGS := -Werror
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -25,7 +25,7 @@
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_SRC_FILES := $(libsparse_src_files)
 LOCAL_MODULE := libsparse
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
 LOCAL_SHARED_LIBRARIES := \
     libz
 LOCAL_CFLAGS := -Werror
@@ -36,7 +36,7 @@
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_SRC_FILES := $(libsparse_src_files)
 LOCAL_MODULE := libsparse_static
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
 LOCAL_STATIC_LIBRARIES := libz
 LOCAL_CFLAGS := -Werror
 include $(BUILD_STATIC_LIBRARY)