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 (cherry picked from commit b360857)
apq8084 · Apr 17, 2018 · 5cd994c · 5cd994c
1 parent a79fb63
commit 5cd994c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
-#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_PROPRIETARY_MODULE      := true