diff options
| author | Colin Cross <ccross@android.com> | 2015-12-21 16:30:17 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-12-21 16:30:17 -0800 |
| commit | 589c5ac47ebe87db550dbfd340a126977c3e2db8 (patch) | |
| tree | ac71176cab1d08a593db19764ff2dcaf83b14a79 | |
| parent | 8b78078de454d54e5eb9544aa1e5a170f079fbcc (diff) | |
| download | libselinux-589c5ac47ebe87db550dbfd340a126977c3e2db8.tar.gz | |
libselinux: stop copying headersbrillo-m9-releasebrillo-m9-dev
Copying headers causes problems for dependency tracking, as any module
can include the copied header without depending on the module. Replace
LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS.
Change-Id: Ic3343fc6b8978d59d1ef48ebdb9a96470bb27232
| -rw-r--r-- | Android.mk | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -41,20 +41,18 @@ common_HOST_FILES := \ src/label_support.c -common_COPY_HEADERS_TO := selinux -common_COPY_HEADERS := include/selinux/selinux.h include/selinux/label.h include/selinux/context.h include/selinux/avc.h include/selinux/android.h - include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_SRC_FILES) $(common_HOST_FILES) src/android.c LOCAL_MODULE:= libselinux LOCAL_MODULE_TAGS := eng LOCAL_STATIC_LIBRARIES := libmincrypt -LOCAL_C_INCLUDES := external/pcre +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/pcre LOCAL_WHOLE_STATIC_LIBRARIES := libpcre libpackagelistparser # 1003 corresponds to auditd, from system/core/logd/event.logtags LOCAL_CFLAGS := -DAUDITD_LOG_TAG=1003 # mapping.c has redundant check of array p_in->perms. LOCAL_CLANG_CFLAGS += -Wno-pointer-bool-conversion +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include include $(BUILD_STATIC_LIBRARY) @@ -69,22 +67,22 @@ LOCAL_SRC_FILES := $(common_HOST_FILES) LOCAL_MODULE:= libselinux LOCAL_MODULE_TAGS := eng LOCAL_WHOLE_STATIC_LIBRARIES := libpcre -LOCAL_C_INCLUDES := external/pcre +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/pcre +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_SRC_FILES) $(common_HOST_FILES) src/android.c LOCAL_MODULE:= libselinux LOCAL_MODULE_TAGS := eng -LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) -LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) LOCAL_STATIC_LIBRARIES := libmincrypt -LOCAL_C_INCLUDES := external/pcre +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/pcre LOCAL_SHARED_LIBRARIES := liblog libpcre libpackagelistparser # 1003 corresponds to auditd, from system/core/logd/event.logtags LOCAL_CFLAGS := -DAUDITD_LOG_TAG=1003 # mapping.c has redundant check of array p_in->perms. LOCAL_CLANG_CFLAGS += -Wno-pointer-bool-conversion +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include include $(BUILD_SHARED_LIBRARY) @@ -98,10 +96,9 @@ endif LOCAL_SRC_FILES := $(common_HOST_FILES) LOCAL_MODULE:= libselinux LOCAL_MODULE_TAGS := eng -LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) -LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) LOCAL_WHOLE_STATIC_LIBRARIES := libpcre -LOCAL_C_INCLUDES := external/pcre +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/pcre +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include include $(BUILD_HOST_SHARED_LIBRARY) ################################# |