diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-02-23 14:19:52 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2016-02-23 14:19:52 -0800 |
commit | b360857e924f57588e29e47b047519ce097beed6 (patch) | |
tree | 059a4dcd598a684df1db8c2ccef131710e8b16e4 /msm8994 | |
parent | 4a0358f5648ba7bba42f320adbc069a0cbf4c69a (diff) | |
download | display-b360857e924f57588e29e47b047519ce097beed6.tar.gz |
Fix duplicate copy file rules
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
Diffstat (limited to 'msm8994')
-rw-r--r-- | msm8994/libcopybit/Android.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/msm8994/libcopybit/Android.mk b/msm8994/libcopybit/Android.mk index 97dd4cf2..8a1c6126 100644 --- a/msm8994/libcopybit/Android.mk +++ b/msm8994/libcopybit/Android.mk @@ -14,16 +14,16 @@ LOCAL_PATH:= $(call my-dir) include $(LOCAL_PATH)/../common.mk -include $(CLEAR_VARS) - -# b/24171136 many files not compiling with clang/llvm yet -LOCAL_CLANG := false +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) +# b/24171136 many files not compiling with clang/llvm yet +LOCAL_CLANG := false + LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional |