drm: Branch 'master' - 7 commits

[email protected] (Emil Velikov)
Newsgroups gmane.comp.video.dri.patches
Message-ID <[email protected]> 
 Android.common.mk          |   12 ++++++++++++
 Android.mk                 |   17 ++++++-----------
 amdgpu/Android.mk          |    8 ++------
 etnaviv/Android.mk         |    8 ++------
 freedreno/Android.mk       |    8 ++------
 intel/Android.mk           |    8 ++------
 libkms/Android.mk          |    6 ++----
 nouveau/Android.mk         |    8 ++------
 radeon/Android.mk          |    8 ++------
 tests/exynos/Makefile.am   |    4 ++--
 tests/modetest/Android.mk  |    3 ++-
 tests/modetest/Makefile.am |    4 ++--
 tests/nouveau/Makefile.am  |    8 ++++----
 tests/proptest/Android.mk  |    3 ++-
 tests/util/Android.mk      |    7 ++-----
 15 files changed, 46 insertions(+), 66 deletions(-)

New commits:
commit 8ef7e5b7026d06a803f0bf75fe323c14f142db3a
Author: Tomasz Figa <[email protected]>
Date:   Fri Jan 27 16:21:19 2017 +0900

    tests: Use -pthread in CFLAGS instead of -lpthread
    
    -lpthread is not always a valid flag to pull pthread support, especially
    on Android it will fail to link due to a missing libpthread.so. The more
    generic way to build-in pthread support is to use the -pthread CFLAG, so
    let's use it instead.
    
    Signed-off-by: Tomasz Figa <[email protected]>
    [Emil Velikov: rebase on top of previous commit]
    Signed-off-by: Emil Velikov <[email protected]>

diff --git a/tests/exynos/Makefile.am b/tests/exynos/Makefile.am
index 357d6b8..b636172 100644
--- a/tests/exynos/Makefile.am
+++ b/tests/exynos/Makefile.am
@@ -1,4 +1,5 @@
 AM_CFLAGS = \
+	-pthread \
 	$(WARN_CFLAGS)\
 	-I $(top_srcdir)/include/drm \
 	-I $(top_srcdir)/libkms/ \
@@ -34,8 +35,7 @@ exynos_fimg2d_perf_LDADD = \
 
 exynos_fimg2d_event_LDADD = \
 	$(top_builddir)/libdrm.la \
-	$(top_builddir)/exynos/libdrm_exynos.la \
-	-lpthread
+	$(top_builddir)/exynos/libdrm_exynos.la
 
 exynos_fimg2d_test_LDADD = \
 	$(top_builddir)/libdrm.la \
diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
index 9686ccb..4b296c8 100644
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -3,6 +3,7 @@ include Makefile.sources
 AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS))
 
 AM_CFLAGS += \
+	-pthread \
 	-I$(top_srcdir)/include/drm \
 	-I$(top_srcdir)/tests \
 	-I$(top_srcdir)
@@ -20,5 +21,4 @@ modetest_SOURCES = $(MODETEST_FILES)
 modetest_LDADD = \
 	$(top_builddir)/libdrm.la \
 	$(top_builddir)/tests/util/libutil.la \
-	$(CAIRO_LIBS) \
-	-lpthread
+	$(CAIRO_LIBS)
diff --git a/tests/nouveau/Makefile.am b/tests/nouveau/Makefile.am
index 225d6e6..3c799a8 100644
--- a/tests/nouveau/Makefile.am
+++ b/tests/nouveau/Makefile.am
@@ -1,4 +1,5 @@
 AM_CFLAGS = \
+	-pthread \
 	$(WARN_CFLAGS) \
 	-I$(top_srcdir)/include/drm \
 	-I$(top_srcdir)/nouveau \
@@ -7,7 +8,7 @@ AM_CFLAGS = \
 LDADD = \
 	../../nouveau/libdrm_nouveau.la \
 	../../libdrm.la \
-	-ldl -lpthread
+	-ldl
 
 TESTS = threaded
 
commit 58459a57fa7202ca2c1f10607ac2d91c6c05f55f
Author: Emil Velikov <[email protected]>
Date:   Fri Jan 27 16:15:45 2017 +0000

    tests/nouveau: automake: fold C and CPP flags
    
    Since we don't have any C++ souces this should be a no-op. Folding the
    two seems to be the common practise throughout the repo.
    
    Signed-off-by: Emil Velikov <[email protected]>

diff --git a/tests/nouveau/Makefile.am b/tests/nouveau/Makefile.am
index c4f6e29..225d6e6 100644
--- a/tests/nouveau/Makefile.am
+++ b/tests/nouveau/Makefile.am
@@ -1,10 +1,9 @@
-AM_CPPFLAGS = \
+AM_CFLAGS = \
+	$(WARN_CFLAGS) \
 	-I$(top_srcdir)/include/drm \
 	-I$(top_srcdir)/nouveau \
 	-I$(top_srcdir)
 
-AM_CFLAGS = $(WARN_CFLAGS)
-
 LDADD = \
 	../../nouveau/libdrm_nouveau.la \
 	../../libdrm.la \
commit 9c924e823543d24476d73b3f5878935552f31891
Author: Emil Velikov <[email protected]>
Date:   Sun Jan 22 17:43:13 2017 +0000

    android: silence ~550 warnings
    
    Analogous to the autoconf build add the following to the build
    
       -Wno-unused-parameter
       -Wno-missing-field-initializers
    
    Cc: Chih-Wei Huang <[email protected]>
    Cc: Rob Herring <[email protected]>
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Rob Herring <[email protected]>

diff --git a/Android.common.mk b/Android.common.mk
index 71f14ec..f57b8d3 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -3,6 +3,10 @@ LOCAL_CFLAGS += \
 	-DHAVE_VISIBILITY=1 \
 	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 
+LOCAL_CFLAGS += \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers
+
 # Quiet down the build system and remove any .h files from the sources
 LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))
 LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH)
commit ff38457e0f72b24d3a9952893afae4f68da8e479
Author: Emil Velikov <[email protected]>
Date:   Sun Jan 22 17:06:05 2017 +0000

    android: add note about command line defines and config.h
    
    Cc: Chih-Wei Huang <[email protected]>
    Cc: Rob Herring <[email protected]>
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Rob Herring <[email protected]>

diff --git a/Android.common.mk b/Android.common.mk
index ffe9219..71f14ec 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -1,3 +1,4 @@
+# XXX: Consider moving these to config.h analogous to autoconf.
 LOCAL_CFLAGS += \
 	-DHAVE_VISIBILITY=1 \
 	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
commit fc05e89b6f8634e9f347040c0e654e640cca067c
Author: Emil Velikov <[email protected]>
Date:   Sun Jan 22 17:03:07 2017 +0000

    android: add HAVE_VISIBILITY to Android.common.mk
    
    Currently only libdrm.so properly annotates its internal/private
    symbols. By setting the macro every binary produced will be in the same
    boat. This should give is smaller and more secure files
    
    Cc: Chih-Wei Huang <[email protected]>
    Cc: Rob Herring <[email protected]>
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Rob Herring <[email protected]>

diff --git a/Android.common.mk b/Android.common.mk
index c6ab8f5..ffe9219 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -1,4 +1,5 @@
 LOCAL_CFLAGS += \
+	-DHAVE_VISIBILITY=1 \
 	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 
 # Quiet down the build system and remove any .h files from the sources
diff --git a/Android.mk b/Android.mk
index ec6d532..5209059 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,9 +41,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include/drm
 
-LOCAL_CFLAGS := \
-	-DHAVE_VISIBILITY=1
-
 include $(LIBDRM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
@@ -58,9 +55,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
 LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/include/drm
 
-LOCAL_CFLAGS := \
-	-DHAVE_VISIBILITY=1
-
 include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
 
commit 03d2e91d00cb78d49fe170fb19a29107951a8c96
Author: Emil Velikov <[email protected]>
Date:   Sun Jan 22 16:59:42 2017 +0000

    android: introduce Android.common.mk to reduce boilerplate
    
    ... across the makefiles. Currently this isn't much but that will change
    shortly.
    
    As an added bonus this fixes all present and future cases where we've
    forgotten to strip out the headers from LOCAL_SRC_FILES.
    
    In a couple of cases (the tests) we start setting
    LOCAL_EXPORT_C_INCLUDE_DIRS, which shouldn't be an issue.
    
    Cc: Chih-Wei Huang <[email protected]>
    Cc: Rob Herring <[email protected]>
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Rob Herring <[email protected]>

diff --git a/Android.common.mk b/Android.common.mk
new file mode 100644
index 0000000..c6ab8f5
--- /dev/null
+++ b/Android.common.mk
@@ -0,0 +1,6 @@
+LOCAL_CFLAGS += \
+	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+
+# Quiet down the build system and remove any .h files from the sources
+LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))
+LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH)
diff --git a/Android.mk b/Android.mk
index 6ecc4e1..ec6d532 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,6 +21,8 @@
 # IN THE SOFTWARE.
 #
 
+LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk
+
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -31,7 +33,7 @@ include $(LOCAL_PATH)/Makefile.sources
 include $(CLEAR_VARS)
 LOCAL_MODULE := libdrm
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES))
+LOCAL_SRC_FILES := $(LIBDRM_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(LOCAL_PATH) \
 	$(LOCAL_PATH)/include/drm
@@ -40,25 +42,26 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include/drm
 
 LOCAL_CFLAGS := \
-	-DHAVE_VISIBILITY=1 \
-	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+	-DHAVE_VISIBILITY=1
+
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # Shared library for the device
 include $(CLEAR_VARS)
 LOCAL_MODULE := libdrm
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES))
+LOCAL_SRC_FILES := $(LIBDRM_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
-        $(LOCAL_PATH) \
         $(LOCAL_PATH)/include/drm
 
 LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/include/drm
 
 LOCAL_CFLAGS := \
-        -DHAVE_VISIBILITY=1 \
-        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+	-DHAVE_VISIBILITY=1
+
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
index 332d957..bf0611b 100644
--- a/amdgpu/Android.mk
+++ b/amdgpu/Android.mk
@@ -8,10 +8,7 @@ LOCAL_MODULE := libdrm_amdgpu
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_AMDGPU_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
-LOCAL_CFLAGS := \
-	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
 
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/etnaviv/Android.mk b/etnaviv/Android.mk
index a70eeac..390f9a9 100644
--- a/etnaviv/Android.mk
+++ b/etnaviv/Android.mk
@@ -8,10 +8,7 @@ LOCAL_MODULE := libdrm_etnaviv
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_ETNAVIV_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
-LOCAL_CFLAGS := \
-	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+LOCAL_SRC_FILES := $(LIBDRM_ETNAVIV_FILES)
 
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/freedreno/Android.mk b/freedreno/Android.mk
index d7e80e1..2b582ae 100644
--- a/freedreno/Android.mk
+++ b/freedreno/Android.mk
@@ -8,10 +8,7 @@ LOCAL_MODULE := libdrm_freedreno
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FREEDRENO_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
-LOCAL_CFLAGS := \
-	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES)
 
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/intel/Android.mk b/intel/Android.mk
index e7ec5a5..5407ff3 100644
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -29,14 +29,11 @@ include $(LOCAL_PATH)/Makefile.sources
 
 LOCAL_MODULE := libdrm_intel
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_INTEL_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
-LOCAL_CFLAGS := \
-	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES)
 
 LOCAL_SHARED_LIBRARIES := \
 	libdrm \
 	libpciaccess
 
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/libkms/Android.mk b/libkms/Android.mk
index 0259ffb..0be7205 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 := $(patsubst %.h, , $(LIBKMS_FILES))
+LOCAL_SRC_FILES := $(LIBKMS_FILES)
 
 ifneq ($(filter $(vmwgfx_drivers), $(DRM_GPU_DRIVERS)),)
 LOCAL_SRC_FILES += $(LIBKMS_VMWGFX_FILES)
@@ -47,6 +47,5 @@ endif
 LOCAL_MODULE := libkms
 LOCAL_SHARED_LIBRARIES := libdrm
 
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/nouveau/Android.mk b/nouveau/Android.mk
index 451f9a7..b430af4 100644
--- a/nouveau/Android.mk
+++ b/nouveau/Android.mk
@@ -8,10 +8,7 @@ LOCAL_MODULE := libdrm_nouveau
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_NOUVEAU_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
-LOCAL_CFLAGS := \
-	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES)
 
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/radeon/Android.mk b/radeon/Android.mk
index 57cbc92..71040da 100644
--- a/radeon/Android.mk
+++ b/radeon/Android.mk
@@ -8,10 +8,7 @@ LOCAL_MODULE := libdrm_radeon
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_RADEON_FILES))
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
-LOCAL_CFLAGS := \
-	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES)
 
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk
index 6a7f406..c1a71fd 100644
--- a/tests/modetest/Android.mk
+++ b/tests/modetest/Android.mk
@@ -3,11 +3,12 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(MODETEST_FILES))
+LOCAL_SRC_FILES := $(MODETEST_FILES)
 
 LOCAL_MODULE := modetest
 
 LOCAL_SHARED_LIBRARIES := libdrm
 LOCAL_STATIC_LIBRARIES := libdrm_util
 
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_EXECUTABLE)
diff --git a/tests/proptest/Android.mk b/tests/proptest/Android.mk
index badeb58..91a590f 100644
--- a/tests/proptest/Android.mk
+++ b/tests/proptest/Android.mk
@@ -3,11 +3,12 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
-LOCAL_SRC_FILES := $(patsubst %.h, , $(PROPTEST_FILES))
+LOCAL_SRC_FILES := $(PROPTEST_FILES)
 
 LOCAL_MODULE := proptest
 
 LOCAL_SHARED_LIBRARIES := libdrm
 LOCAL_STATIC_LIBRARIES := libdrm_util
 
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_EXECUTABLE)
diff --git a/tests/util/Android.mk b/tests/util/Android.mk
index c9d087e..7656c4c 100644
--- a/tests/util/Android.mk
+++ b/tests/util/Android.mk
@@ -30,9 +30,7 @@ LOCAL_MODULE := libdrm_util
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
-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))
+LOCAL_SRC_FILES := $(UTIL_FILES)
 
+include $(LIBDRM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
commit de5b41ef5ab617e5284596e220bc72f6065919f5
Author: Emil Velikov <[email protected]>
Date:   Sun Jan 22 16:16:27 2017 +0000

    android: remove LOCAL_MODULE_TAGS := optional tag
    
    Seems to be the default option since ~2009 with commit 2f31293ba78 "auto
    import from //branches/cupcake/...@137197". Fleshed out from a larger
    commit in the AOSP repo/fork.
    
    Cc: Dan Willemsen <[email protected]>
    Cc: Chih-Wei Huang <[email protected]>
    Cc: Rob Herring <[email protected]>
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Rob Herring <[email protected]>

diff --git a/Android.mk b/Android.mk
index 2aa2bc9..6ecc4e1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,6 @@ include $(LOCAL_PATH)/Makefile.sources
 #static library for the device (recovery)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libdrm
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES))
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
@@ -48,7 +47,6 @@ include $(BUILD_STATIC_LIBRARY)
 # Shared library for the device
 include $(CLEAR_VARS)
 LOCAL_MODULE := libdrm
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES))
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
index 57c53a7..332d957 100644
--- a/amdgpu/Android.mk
+++ b/amdgpu/Android.mk
@@ -5,7 +5,6 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
 LOCAL_MODULE := libdrm_amdgpu
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
diff --git a/etnaviv/Android.mk b/etnaviv/Android.mk
index a3a2295..a70eeac 100644
--- a/etnaviv/Android.mk
+++ b/etnaviv/Android.mk
@@ -5,7 +5,6 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
 LOCAL_MODULE := libdrm_etnaviv
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
diff --git a/freedreno/Android.mk b/freedreno/Android.mk
index fba48f2..d7e80e1 100644
--- a/freedreno/Android.mk
+++ b/freedreno/Android.mk
@@ -5,7 +5,6 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
 LOCAL_MODULE := libdrm_freedreno
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
diff --git a/intel/Android.mk b/intel/Android.mk
index 838a93b..e7ec5a5 100644
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -28,7 +28,6 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
 LOCAL_MODULE := libdrm_intel
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_INTEL_FILES))
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
diff --git a/libkms/Android.mk b/libkms/Android.mk
index cf0e9bb..0259ffb 100644
--- a/libkms/Android.mk
+++ b/libkms/Android.mk
@@ -45,7 +45,6 @@ LOCAL_SRC_FILES += $(LIBKMS_RADEON_FILES)
 endif
 
 LOCAL_MODULE := libkms
-LOCAL_MODULE_TAGS := optional
 LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
diff --git a/nouveau/Android.mk b/nouveau/Android.mk
index b67d30f..451f9a7 100644
--- a/nouveau/Android.mk
+++ b/nouveau/Android.mk
@@ -5,7 +5,6 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
 LOCAL_MODULE := libdrm_nouveau
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
diff --git a/radeon/Android.mk b/radeon/Android.mk
index e704443..57cbc92 100644
--- a/radeon/Android.mk
+++ b/radeon/Android.mk
@@ -5,7 +5,6 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
 LOCAL_MODULE := libdrm_radeon
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
diff --git a/tests/util/Android.mk b/tests/util/Android.mk
index 1bd82ae..c9d087e 100644
--- a/tests/util/Android.mk
+++ b/tests/util/Android.mk
@@ -27,7 +27,6 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Makefile.sources
 
 LOCAL_MODULE := libdrm_util
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := libdrm
 

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
--
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.