diff options
author | Jiyong Park <jiyong@google.com> | 2017-07-11 20:09:44 +0900 |
---|---|---|
committer | Yifan Hong <elsk@google.com> | 2017-07-21 00:44:49 +0000 |
commit | a4f9c563327a8e8095ff853bcc3d68e4736b40e2 (patch) | |
tree | 06f6be5cee10c8a1d4f94406b3fa1b42992b94ba | |
parent | 486c2664fe64fbe048969c72b6d5a775e817abf2 (diff) | |
download | libdrm-oreo-mr1-dev.tar.gz |
Build libdrm* modules with BOARD_VNDK_VERSIONoreo-mr1-dev
They are marked as vendor module since they all are depending on libdrm,
which is a vendor lib.
Also, libdrm_platform is newly introduced as the platform version of
libdrm.
Bug: 37342627
Bug: 63741047
Test: BOARD_VNDK_VERSION=current m -j libdrm_amdgpu libdrm_etnaviv
libdrm_freedreno libdrm_intel libdrm_nouveau libdrm_radeon
libdrm_rockchip libdrm_tegra libkms modetest atomictest planetest
Change-Id: Ic1ff6fb616f406f1c5e005d3e6f6039758d62315
Merged-In: Ic1ff6fb616f406f1c5e005d3e6f6039758d62315
(cherry picked from commit ac77138cb1a0afadceab3cbb779c01ab718b5b19)
-rw-r--r-- | Android.mk | 58 | ||||
-rw-r--r-- | amdgpu/Android.mk | 2 | ||||
-rw-r--r-- | etnaviv/Android.mk | 1 | ||||
-rw-r--r-- | freedreno/Android.mk | 2 | ||||
-rw-r--r-- | intel/Android.mk | 1 | ||||
-rw-r--r-- | libkms/Android.mk | 1 | ||||
-rw-r--r-- | nouveau/Android.mk | 1 | ||||
-rw-r--r-- | radeon/Android.mk | 1 | ||||
-rw-r--r-- | rockchip/Android.mk | 2 | ||||
-rw-r--r-- | tegra/Android.mk | 2 | ||||
-rw-r--r-- | tests/modetest/Android.mk | 2 | ||||
-rw-r--r-- | tests/planetest/Android.mk | 4 | ||||
-rw-r--r-- | tests/proptest/Android.mk | 2 | ||||
-rw-r--r-- | tests/util/Android.mk | 2 |
14 files changed, 71 insertions, 10 deletions
@@ -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 @@ common_CFLAGS := \ # 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 $(LIBDRM_COMMON_MK) 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 bf0611ba..1df84b3e 100644 --- a/amdgpu/Android.mk +++ b/amdgpu/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) 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 390f9a98..1143eac5 100644 --- a/etnaviv/Android.mk +++ b/etnaviv/Android.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) 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 2b582aed..c1289145 100644 --- a/freedreno/Android.mk +++ b/freedreno/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) 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 2a0dc4cb..f8b27dd5 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -28,6 +28,7 @@ include $(CLEAR_VARS) 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 9f81d8e3..8a38ad54 100644 --- a/libkms/Android.mk +++ b/libkms/Android.mk @@ -49,6 +49,7 @@ LOCAL_SRC_FILES += $(LIBKMS_RADEON_FILES) 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 b430af4f..27433d87 100644 --- a/nouveau/Android.mk +++ b/nouveau/Android.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) 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 71040dab..7bc9cee9 100644 --- a/radeon/Android.mk +++ b/radeon/Android.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) 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 05d421e2..6a2d3016 100644 --- a/rockchip/Android.mk +++ b/rockchip/Android.mk @@ -13,4 +13,6 @@ LOCAL_CFLAGS := \ LOCAL_SHARED_LIBRARIES := \ libdrm +LOCAL_VENDOR_MODULE := true + include $(BUILD_SHARED_LIBRARY) diff --git a/tegra/Android.mk b/tegra/Android.mk index d2a1a59d..861db348 100644 --- a/tegra/Android.mk +++ b/tegra/Android.mk @@ -13,4 +13,6 @@ LOCAL_CFLAGS := \ 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 ab40b806..4f9b02d3 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := $(filter-out %.h,$(MODETEST_FILES)) 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 3616e2b9..4c97e1e3 100644 --- a/tests/planetest/Android.mk +++ b/tests/planetest/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(PLANETEST_FILES) LOCAL_MODULE := planetest -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := libdrm_platform include $(BUILD_EXECUTABLE) @@ -18,6 +18,6 @@ LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES 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 588fbed2..eaada3b1 100644 --- a/tests/proptest/Android.mk +++ b/tests/proptest/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := $(PROPTEST_FILES) 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 7656c4c2..44c524d2 100644 --- a/tests/util/Android.mk +++ b/tests/util/Android.mk @@ -28,7 +28,7 @@ include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_util -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := libdrm_platform LOCAL_SRC_FILES := $(UTIL_FILES) |