diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-23 07:32:43 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-23 07:32:43 +0000 |
commit | 401cff4afaf7198ea54c086cad6305f987afb940 (patch) | |
tree | 06f6be5cee10c8a1d4f94406b3fa1b42992b94ba | |
parent | 96fa02c8402050bd34bb32182137c0edefe06b7f (diff) | |
parent | a4f9c563327a8e8095ff853bcc3d68e4736b40e2 (diff) | |
download | libdrm-oreo-m2-s5-release.tar.gz |
release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release-4207446 snap-temp-L19600000085022555android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: I57dbc6ad18a2f38b9a12318fadbad7129a8c3090
-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) |