Android: strip out header files from sources list
PATCH 1/1 Android: strip out header files from sources list
AOSP master now errors if LOCAL_SRC_FILES contains headers, so filter out header files from the source lists.
Signed-off-by Rob Herring <[email protected]>
--- Android.mk | 4 ++-- amdgpu/Android.mk | 2 +- freedreno/Android.mk | 2 +- intel/Android.mk | 2 +- libkms/Android.mk | 2 +- nouveau/Android.mk | 2 +- radeon/Android.mk | 2 +- tests/modetest/Android.mk | 2 +- tests/proptest/Android.mk | 2 +- tests/util/Android.mk | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-)
Android.mk +2 -2
@@ -32,7 +32,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libdrm LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(LIBDRM_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/include/drm
@@ -50,7 +50,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libdrm LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(LIBDRM_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/include/drm
amdgpu/Android.mk +1 -1
@@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_AMDGPU_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \
freedreno/Android.mk +1 -1
@@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FREEDRENO_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \
intel/Android.mk +1 -1
@@ -30,7 +30,7 @@ include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_intel LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_INTEL_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \
libkms/Android.mk +1 -1
@@ -26,7 +26,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources -LOCAL_SRC_FILES := $(LIBKMS_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBKMS_FILES)) ifneq ($(filter $(vmwgfx_drivers), $(DRM_GPU_DRIVERS)),) LOCAL_SRC_FILES += $(LIBKMS_VMWGFX_FILES)
nouveau/Android.mk +1 -1
@@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_NOUVEAU_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \
radeon/Android.mk +1 -1
@@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_RADEON_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \
tests/modetest/Android.mk +1 -1
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources -LOCAL_SRC_FILES := $(MODETEST_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(MODETEST_FILES)) LOCAL_MODULE := modetest
tests/proptest/Android.mk +1 -1
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources -LOCAL_SRC_FILES := $(PROPTEST_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(PROPTEST_FILES)) LOCAL_MODULE := proptest
tests/util/Android.mk +1 -1
@@ -31,7 +31,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(UTIL_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(UTIL_FILES)) # avoid name clashes by requiring users to include util/*.h LOCAL_EXPORT_C_INCLUDE_DIRS := $(dir $(LOCAL_PATH))
Signature · 6 lines
2.9.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Emil Velikov
AppliedQuoted 3 lines · Rob Herring
AOSP master now errors if
LOCAL_SRC_FILEScontains headers, so filter out header files from the source lists.
Pushed to master.
Thanks Rob.
-Emil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel