release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release-4207446 snap-temp-L19600000085022555
Change-Id: I57dbc6ad18a2f38b9a12318fadbad7129a8c3090
diff --git a/Android.mk b/Android.mk
index 102c9a3..501b12e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,8 +21,9 @@
# IN THE SOFTWARE.
#
-
-ifneq ($(TARGET_USE_PRIVATE_LIBDRM),true)
+# Two identical libs are defined here.
+# libdrm: for vendors. installed to /vendor/lib. libdrm_<vendor> uses this.
+# libdrm_platform: for platform modules (such as libminui). installed to /system/lib
LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk
@@ -40,7 +41,58 @@
# Static library for the device (recovery)
include $(CLEAR_VARS)
+LOCAL_MODULE := libdrm_platform
+
+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)
+
+include $(LIBDRM_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# Dynamic library for the device
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libdrm_platform
+
+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)
+
+include $(LIBDRM_COMMON_MK)
+include $(BUILD_SHARED_LIBRARY)
+
+
+ifneq ($(TARGET_USE_PRIVATE_LIBDRM),true)
+
+# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
+include $(LOCAL_PATH)/Makefile.sources
+
+common_CFLAGS := \
+ -Wno-enum-conversion \
+ -Wno-pointer-arith \
+ -Wno-sign-compare \
+ -Wno-tautological-compare
+
+# Static library for the device (recovery)
+include $(CLEAR_VARS)
+
LOCAL_MODULE := libdrm
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
LOCAL_EXPORT_C_INCLUDE_DIRS := \
@@ -77,4 +129,4 @@
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
+endif # if TARGET_USE_PRIVATE_LIBDRM is not true
diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
index bf0611b..1df84b3 100644
--- a/amdgpu/Android.mk
+++ b/amdgpu/Android.mk
@@ -5,7 +5,7 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_amdgpu
-
+LOCAL_VENDOR_MODULE := true
LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
diff --git a/etnaviv/Android.mk b/etnaviv/Android.mk
index 390f9a9..1143eac 100644
--- a/etnaviv/Android.mk
+++ b/etnaviv/Android.mk
@@ -5,6 +5,7 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_etnaviv
+LOCAL_VENDOR_MODULE := true
LOCAL_SHARED_LIBRARIES := libdrm
diff --git a/freedreno/Android.mk b/freedreno/Android.mk
index 2b582ae..c128914 100644
--- a/freedreno/Android.mk
+++ b/freedreno/Android.mk
@@ -5,7 +5,7 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_freedreno
-
+LOCAL_VENDOR_MODULE := true
LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES)
diff --git a/intel/Android.mk b/intel/Android.mk
index 2a0dc4c..f8b27dd 100644
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -28,6 +28,7 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_intel
+LOCAL_VENDOR_MODULE := true
# Removed dependency to libpciaccess: not used on Android
LOCAL_SHARED_LIBRARIES := libdrm
diff --git a/libkms/Android.mk b/libkms/Android.mk
index 9f81d8e..8a38ad5 100644
--- a/libkms/Android.mk
+++ b/libkms/Android.mk
@@ -49,6 +49,7 @@
endif
LOCAL_MODULE := libkms
+LOCAL_VENDOR_MODULE := true
LOCAL_SHARED_LIBRARIES := libdrm
include $(LIBDRM_COMMON_MK)
diff --git a/nouveau/Android.mk b/nouveau/Android.mk
index b430af4..27433d8 100644
--- a/nouveau/Android.mk
+++ b/nouveau/Android.mk
@@ -5,6 +5,7 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_nouveau
+LOCAL_VENDOR_MODULE := true
LOCAL_SHARED_LIBRARIES := libdrm
diff --git a/radeon/Android.mk b/radeon/Android.mk
index 71040da..7bc9cee 100644
--- a/radeon/Android.mk
+++ b/radeon/Android.mk
@@ -5,6 +5,7 @@
include $(LOCAL_PATH)/Makefile.sources
LOCAL_MODULE := libdrm_radeon
+LOCAL_VENDOR_MODULE := true
LOCAL_SHARED_LIBRARIES := libdrm
diff --git a/rockchip/Android.mk b/rockchip/Android.mk
index 05d421e..6a2d301 100644
--- a/rockchip/Android.mk
+++ b/rockchip/Android.mk
@@ -13,4 +13,6 @@
LOCAL_SHARED_LIBRARIES := \
libdrm
+LOCAL_VENDOR_MODULE := true
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/tegra/Android.mk b/tegra/Android.mk
index d2a1a59..861db34 100644
--- a/tegra/Android.mk
+++ b/tegra/Android.mk
@@ -13,4 +13,6 @@
LOCAL_SHARED_LIBRARIES := \
libdrm
+LOCAL_VENDOR_MODULE := true
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk
index ab40b80..4f9b02d 100644
--- a/tests/modetest/Android.mk
+++ b/tests/modetest/Android.mk
@@ -7,7 +7,7 @@
LOCAL_MODULE := modetest
-LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_SHARED_LIBRARIES := libdrm_platform
LOCAL_STATIC_LIBRARIES := libdrm_util
LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
diff --git a/tests/planetest/Android.mk b/tests/planetest/Android.mk
index 3616e2b..4c97e1e 100644
--- a/tests/planetest/Android.mk
+++ b/tests/planetest/Android.mk
@@ -7,7 +7,7 @@
LOCAL_MODULE := planetest
-LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_SHARED_LIBRARIES := libdrm_platform
include $(BUILD_EXECUTABLE)
@@ -18,6 +18,6 @@
LOCAL_MODULE := atomictest
-LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_SHARED_LIBRARIES := libdrm_platform
include $(BUILD_EXECUTABLE)
diff --git a/tests/proptest/Android.mk b/tests/proptest/Android.mk
index 588fbed..eaada3b 100644
--- a/tests/proptest/Android.mk
+++ b/tests/proptest/Android.mk
@@ -7,7 +7,7 @@
LOCAL_MODULE := proptest
-LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_SHARED_LIBRARIES := libdrm_platform
LOCAL_STATIC_LIBRARIES := libdrm_util
LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
diff --git a/tests/util/Android.mk b/tests/util/Android.mk
index 7656c4c..44c524d 100644
--- a/tests/util/Android.mk
+++ b/tests/util/Android.mk
@@ -28,7 +28,7 @@
LOCAL_MODULE := libdrm_util
-LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_SHARED_LIBRARIES := libdrm_platform
LOCAL_SRC_FILES := $(UTIL_FILES)
