Remove headers from LOCAL_SRC_FILES
The build system does not use headers in LOCAL_SRC_FILES. To prevent
typos, it's becoming a warning to add something to LOCAL_SRC_FILES that
is not used. Since these lists are coming from file shared with other
Makefile systems, use filter-out to do this dynamically. Once we move to
Soong, we will need our own lists though - Soong cannot read makefiles.
Remove LOCAL_EXPORT_C_INCLUDE_DIR entries that do not exist.
Also clean up LOCAL_C_INCLUDES -- with LOCAL_EXPORT_C_INCLUDE_DIRS and
the default $(LOCAL_PATH) entry, most were not necessary.
Remove LOCAL_MODULE_TAGS := optional, that's the default.
Change-Id: I2d77814eb227371da2945f6aede671d9f66d7b09
diff --git a/Android.mk b/Android.mk
index 38b67d0..35ea367 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,6 @@
#
LOCAL_PATH := $(call my-dir)
-LIBDRM_TOP := $(LOCAL_PATH)
# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
include $(LOCAL_PATH)/Makefile.sources
@@ -31,8 +30,7 @@
# Static library for the device (recovery)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LIBDRM_FILES)
+LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm
LOCAL_CFLAGS := $(common_CFLAGS)
@@ -41,8 +39,7 @@
# Dynamic library for the device
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LIBDRM_FILES)
+LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm
LOCAL_CFLAGS := $(common_CFLAGS)
@@ -59,5 +56,5 @@
tests/modetest \
tests/planetest
-mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS))
+mkfiles := $(patsubst %,$(LOCAL_PATH)/%/Android.mk,$(SUBDIRS))
include $(mkfiles)
diff --git a/freedreno/Android.mk b/freedreno/Android.mk
index 5be5bc8..7abaeb7 100644
--- a/freedreno/Android.mk
+++ b/freedreno/Android.mk
@@ -5,18 +5,10 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_freedreno
-LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdrm
-LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
- $(LOCAL_PATH)/freedreno
-
-LOCAL_C_INCLUDES := \
- $(LIBDRM_TOP) \
- $(LIBDRM_TOP)/freedreno \
- $(LIBDRM_TOP)/include/drm
+LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FREEDRENO_FILES))
LOCAL_CFLAGS := \
-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
diff --git a/intel/Android.mk b/intel/Android.mk
index 1a1fc6e..bb47462 100644
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -28,18 +28,12 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_intel
-LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdrm
-LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
- $(LOCAL_PATH)/intel
+LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_INTEL_FILES))
LOCAL_C_INCLUDES := \
- $(LIBDRM_TOP) \
- $(LIBDRM_TOP)/intel \
- $(LIBDRM_TOP)/include/drm \
external/libpciaccess/include
LOCAL_CFLAGS := \
diff --git a/libkms/Android.mk b/libkms/Android.mk
index bcadc2f..34c10f5 100644
--- a/libkms/Android.mk
+++ b/libkms/Android.mk
@@ -46,6 +46,8 @@
LOCAL_SRC_FILES += $(LIBKMS_RADEON_FILES)
endif
+LOCAL_SRC_FILES := $(filter-out %.h,$(LOCAL_SRC_FILES))
+
LOCAL_MODULE := libkms
LOCAL_SHARED_LIBRARIES := libdrm
diff --git a/nouveau/Android.mk b/nouveau/Android.mk
index 7fb27ae..712c004 100644
--- a/nouveau/Android.mk
+++ b/nouveau/Android.mk
@@ -5,18 +5,10 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_nouveau
-LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdrm
-LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
- $(LOCAL_PATH)/nouveau
-
-LOCAL_C_INCLUDES := \
- $(LIBDRM_TOP) \
- $(LIBDRM_TOP)/nouveau \
- $(LIBDRM_TOP)/include/drm
+LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_NOUVEAU_FILES))
LOCAL_CFLAGS := \
-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
diff --git a/radeon/Android.mk b/radeon/Android.mk
index 7eea641..8783c87 100644
--- a/radeon/Android.mk
+++ b/radeon/Android.mk
@@ -5,18 +5,10 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_radeon
-LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdrm
-LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
- $(LOCAL_PATH)/radeon
-
-LOCAL_C_INCLUDES := \
- $(LIBDRM_TOP) \
- $(LIBDRM_TOP)/radeon \
- $(LIBDRM_TOP)/include/drm
+LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_RADEON_FILES))
LOCAL_CFLAGS := \
-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
diff --git a/rockchip/Android.mk b/rockchip/Android.mk
index 91c72d5..05d421e 100644
--- a/rockchip/Android.mk
+++ b/rockchip/Android.mk
@@ -2,18 +2,10 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libdrm_rockchip
-LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_SRC_FILES := rockchip_drm.c
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
- $(LOCAL_PATH)/rockchip
-
-LOCAL_C_INCLUDES := \
- $(LIBDRM_TOP) \
- $(LIBDRM_TOP)/rockchip \
- $(LIBDRM_TOP)/include/drm
LOCAL_CFLAGS := \
-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
diff --git a/tegra/Android.mk b/tegra/Android.mk
index 71476fa..d2a1a59 100644
--- a/tegra/Android.mk
+++ b/tegra/Android.mk
@@ -2,20 +2,10 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libdrm_tegra
-LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdrm
-LOCAL_SRC_FILES := \
- private.h \
- tegra.c
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
- $(LOCAL_PATH)/tegra
-
-LOCAL_C_INCLUDES := \
- $(LIBDRM_TOP) \
- $(LIBDRM_TOP)/tegra \
- $(LIBDRM_TOP)/include/drm
+LOCAL_SRC_FILES := tegra.c
LOCAL_CFLAGS := \
-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk
index aee3564..6507b48 100644
--- a/tests/modetest/Android.mk
+++ b/tests/modetest/Android.mk
@@ -3,12 +3,10 @@
include $(CLEAR_VARS)
include $(LOCAL_PATH)/Makefile.sources
-LOCAL_SRC_FILES := $(MODETEST_FILES)
+LOCAL_SRC_FILES := $(filter-out %.h,$(MODETEST_FILES))
LOCAL_MODULE := modetest
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
-
LOCAL_SHARED_LIBRARIES := libdrm
include $(BUILD_EXECUTABLE)
diff --git a/tests/planetest/Android.mk b/tests/planetest/Android.mk
index 8f58238..3616e2b 100644
--- a/tests/planetest/Android.mk
+++ b/tests/planetest/Android.mk
@@ -3,12 +3,10 @@
include $(CLEAR_VARS)
include $(LOCAL_PATH)/Makefile.sources
-LOCAL_SRC_FILES := $(PLANETEST_COMMON_FILES) $(PLANETEST_FILES)
+LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(PLANETEST_FILES))
LOCAL_MODULE := planetest
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
-
LOCAL_SHARED_LIBRARIES := libdrm
include $(BUILD_EXECUTABLE)
@@ -16,12 +14,10 @@
include $(CLEAR_VARS)
include $(LOCAL_PATH)/Makefile.sources
-LOCAL_SRC_FILES := $(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES)
+LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES))
LOCAL_MODULE := atomictest
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
-
LOCAL_SHARED_LIBRARIES := libdrm
include $(BUILD_EXECUTABLE)
