diff options
| author | Elliott Hughes <enh@google.com> | 2015-07-23 18:25:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 18:25:03 +0000 |
| commit | 80aa64833c352aebdc2c9d533289e072d263cf04 (patch) | |
| tree | c9ecfd28e7782aaccf93ad266f4dabec7655bd51 | |
| parent | 8428506d14303f9f523c64b5b52a4307f8c75fb7 (diff) | |
| parent | 15c7ae3416c46c9f753df12e194511db76afea41 (diff) | |
| download | expat-80aa64833c352aebdc2c9d533289e072d263cf04.tar.gz | |
am 15c7ae34: Merge "Stop using LOCAL_COPY_HEADERS in expat."
* commit '15c7ae3416c46c9f753df12e194511db76afea41':
Stop using LOCAL_COPY_HEADERS in expat.
| -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 # ===================================================== @@ -60,8 +55,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 @@ -108,8 +101,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) |