diff options
| author | Rob Herring <robh@kernel.org> | 2016-07-05 15:21:18 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-07-06 16:58:38 +0100 |
| commit | d342cd34ac871b29cab709b72e9f1db1ded7e7bb (patch) | |
| tree | 159e5cd1e0bfbf5fea6d73609b76c7e7e95dd4b9 | |
| parent | 7996a8707eacd59a45e7128a543393dca2776e26 (diff) | |
| download | libdrm-d342cd34ac871b29cab709b72e9f1db1ded7e7bb.tar.gz libdrm-d342cd34ac871b29cab709b72e9f1db1ded7e7bb.tar.bz2 libdrm-d342cd34ac871b29cab709b72e9f1db1ded7e7bb.zip | |
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 <robh@kernel.org>
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | amdgpu/Android.mk | 2 | ||||
| -rw-r--r-- | freedreno/Android.mk | 2 | ||||
| -rw-r--r-- | intel/Android.mk | 2 | ||||
| -rw-r--r-- | libkms/Android.mk | 2 | ||||
| -rw-r--r-- | nouveau/Android.mk | 2 | ||||
| -rw-r--r-- | radeon/Android.mk | 2 | ||||
| -rw-r--r-- | tests/modetest/Android.mk | 2 | ||||
| -rw-r--r-- | tests/proptest/Android.mk | 2 | ||||
| -rw-r--r-- | tests/util/Android.mk | 2 |
10 files changed, 11 insertions, 11 deletions
@@ -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 diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk index 469df1b2..57c53a79 100644 --- a/amdgpu/Android.mk +++ b/amdgpu/Android.mk @@ -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 := \ diff --git a/freedreno/Android.mk b/freedreno/Android.mk index 2645f737..fba48f2f 100644 --- a/freedreno/Android.mk +++ b/freedreno/Android.mk @@ -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 := \ diff --git a/intel/Android.mk b/intel/Android.mk index 6582dfde..838a93b3 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -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 := \ diff --git a/libkms/Android.mk b/libkms/Android.mk index a4067829..cf0e9bb0 100644 --- a/libkms/Android.mk +++ b/libkms/Android.mk @@ -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) diff --git a/nouveau/Android.mk b/nouveau/Android.mk index abc6aef7..b67d30fc 100644 --- a/nouveau/Android.mk +++ b/nouveau/Android.mk @@ -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 := \ diff --git a/radeon/Android.mk b/radeon/Android.mk index ace34080..e7044435 100644 --- a/radeon/Android.mk +++ b/radeon/Android.mk @@ -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 := \ diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk index e616558f..6a7f4069 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk @@ -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 diff --git a/tests/proptest/Android.mk b/tests/proptest/Android.mk index d0ab5c92..badeb588 100644 --- a/tests/proptest/Android.mk +++ b/tests/proptest/Android.mk @@ -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 diff --git a/tests/util/Android.mk b/tests/util/Android.mk index 73bc6805..1bd82aec 100644 --- a/tests/util/Android.mk +++ b/tests/util/Android.mk @@ -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)) |