diff options
| author | Elliott Hughes <enh@google.com> | 2015-07-22 18:04:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-22 18:04:19 +0000 |
| commit | 15c7ae3416c46c9f753df12e194511db76afea41 (patch) | |
| tree | 20f9bec2e6b2facde4409655ac3fc484694725ba | |
| parent | 803b729174c246c2a55c6fe59570762b02cc5d11 (diff) | |
| parent | dbe9f410ce55c90ce0a126e7af5a2c4b7a5d341f (diff) | |
| download | expat-15c7ae3416c46c9f753df12e194511db76afea41.tar.gz | |
Merge "Stop using LOCAL_COPY_HEADERS in expat."android-m-preview-2
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -18,11 +18,6 @@ common_CFLAGS := \ common_C_INCLUDES += \ $(LOCAL_PATH)/lib -common_COPY_HEADERS_TO := libexpat -common_COPY_HEADERS := \ - lib/expat.h \ - lib/expat_external.h - # For the host # ===================================================== @@ -58,8 +53,6 @@ endif LOCAL_MODULE:= libexpat-host LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional -LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) -LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib LOCAL_MULTILIB := both @@ -106,8 +99,6 @@ LOCAL_C_INCLUDES += $(common_C_INCLUDES) LOCAL_MODULE:= libexpat LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional -LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) -LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib include $(BUILD_SHARED_LIBRARY) |