[libdrm,1/5] android: remove LOCAL_MODULE_TAGS := optional tag

Commit Message

Emil Velikov Jan. 22, 2017, 6:34 p.m. UTC

Seems to be the default option. Fleshed out from a larger commit in the
AOSP repo/fork.

Cc: Dan Willemsen <[e-mail]>
Cc: Chih-Wei Huang <[e-mail]>
Cc: Rob Herring <[e-mail]>
Signed-off-by: Emil Velikov <[e-mail]>
---
Dan a couple of humble requests:
 - can we get a reference when (Android vX) this is the default ?
 - there's a bunch of nice fixes in-tree - can you (anyone in the team)
cleanup the gerrit/aosp tags, rebase and sent them over - see upstream
autogen.sh
* build fixes leanups
* use mmap64 over __mmap2 (with the fix squashed).
please state since when mmap64 is available
* remove libpciaccess dep (with the printf warning fixed)
* tegra offset fix
* others ?

With the above sorted, it would be a lot easier to rebase the repo when
working on the next Android. Note that the atomic code used here is not
the upstream one - I'd suggest switching over ;-)

Thanks !
---
 Android.mk            | 2 --
 amdgpu/Android.mk     | 1 -
 etnaviv/Android.mk    | 1 -
 freedreno/Android.mk  | 1 -
 intel/Android.mk      | 1 -
 libkms/Android.mk     | 1 -
 nouveau/Android.mk    | 1 -
 radeon/Android.mk     | 1 -
 tests/util/Android.mk | 1 -
 9 files changed, 10 deletions(-)

Patch

diff --git a/Android.mk b/Android.mk
index 2aa2bc96..6ecc4e1c 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 57c53a79..332d9570 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 a3a22959..a70eeac0 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 fba48f2f..d7e80e12 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 838a93b3..e7ec5a57 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 cf0e9bb0..0259ffbb 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 b67d30fc..451f9a73 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 e7044435..57cbc92a 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 1bd82aec..c9d087e3 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