diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-02-23 14:19:52 -0800 |
|---|---|---|
| committer | Alberto97 <albertop2197@gmail.com> | 2016-09-30 15:29:57 -0700 |
| commit | c431afa1d98da7ed29033cca4b07040e44e74696 (patch) | |
| tree | 027484799d9b4cc80b310d1ddbefc5b00f27ca87 | |
| parent | 04500d81b713e1c8ba103686fee776da79f7b5c5 (diff) | |
| download | android_hardware_qcom_display-cm-14.0-caf-8916.tar.gz android_hardware_qcom_display-cm-14.0-caf-8916.tar.bz2 android_hardware_qcom_display-cm-14.0-caf-8916.zip | |
Fix duplicate copy file rulescm-14.0-caf-8916
If these libraries are built, both BUILD_COPY_FILES and
BUILD_SHARED_LIBRARY would copy the headers. This would create a warning
because multiple rules would define the same target header file.
Bug: 27302058
Change-Id: If91bd70d2320aaaee9679642ff9ea48b99739cbd
(cherry picked from commit b360857e924f57588e29e47b047519ce097beed6)
| -rw-r--r-- | libcopybit/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk index f6f7ed514..dc6bbfd85 100644 --- a/libcopybit/Android.mk +++ b/libcopybit/Android.mk @@ -14,13 +14,13 @@ LOCAL_PATH:= $(call my-dir) include $(LOCAL_PATH)/../common.mk -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_COPY_HEADERS_TO := $(common_header_export_path) LOCAL_COPY_HEADERS := copybit.h copybit_priv.h c2d2.h -#Copy the headers regardless of whether copybit is built include $(BUILD_COPY_HEADERS) +include $(CLEAR_VARS) LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional |