aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2017-07-23 02:32:43 -0500
committerandroid-build-team Robot2017-07-23 02:32:43 -0500
commit401cff4afaf7198ea54c086cad6305f987afb940 (patch)
tree06f6be5cee10c8a1d4f94406b3fa1b42992b94ba
parent96fa02c8402050bd34bb32182137c0edefe06b7f (diff)
parenta4f9c563327a8e8095ff853bcc3d68e4736b40e2 (diff)
downloadexternal-libgbm-oreo-mr1-release.tar.gz
external-libgbm-oreo-mr1-release.tar.xz
external-libgbm-oreo-mr1-release.zip
release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release-4207446 snap-temp-L19600000085022555oreo-mr1-release
Change-Id: I57dbc6ad18a2f38b9a12318fadbad7129a8c3090
-rw-r--r--Android.mk58
-rw-r--r--amdgpu/Android.mk2
-rw-r--r--etnaviv/Android.mk1
-rw-r--r--freedreno/Android.mk2
-rw-r--r--intel/Android.mk1
-rw-r--r--libkms/Android.mk1
-rw-r--r--nouveau/Android.mk1
-rw-r--r--radeon/Android.mk1
-rw-r--r--rockchip/Android.mk2
-rw-r--r--tegra/Android.mk2
-rw-r--r--tests/modetest/Android.mk2
-rw-r--r--tests/planetest/Android.mk4
-rw-r--r--tests/proptest/Android.mk2
-rw-r--r--tests/util/Android.mk2
14 files changed, 71 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk
index 102c9a39..501b12eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,8 +21,9 @@
21# IN THE SOFTWARE. 21# IN THE SOFTWARE.
22# 22#
23 23
24 24# Two identical libs are defined here.
25ifneq ($(TARGET_USE_PRIVATE_LIBDRM),true) 25# libdrm: for vendors. installed to /vendor/lib. libdrm_<vendor> uses this.
26# libdrm_platform: for platform modules (such as libminui). installed to /system/lib
26 27
27LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk 28LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk
28 29
@@ -40,7 +41,58 @@ common_CFLAGS := \
40# Static library for the device (recovery) 41# Static library for the device (recovery)
41include $(CLEAR_VARS) 42include $(CLEAR_VARS)
42 43
44LOCAL_MODULE := libdrm_platform
45
46LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
47LOCAL_EXPORT_C_INCLUDE_DIRS := \
48 $(LOCAL_PATH) \
49 $(LOCAL_PATH)/include/drm
50
51LOCAL_C_INCLUDES := \
52 $(LOCAL_PATH)/include/drm
53
54LOCAL_CFLAGS := \
55 $(common_CFLAGS)
56
57include $(LIBDRM_COMMON_MK)
58include $(BUILD_STATIC_LIBRARY)
59
60# Dynamic library for the device
61include $(CLEAR_VARS)
62
63LOCAL_MODULE := libdrm_platform
64
65LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
66LOCAL_EXPORT_C_INCLUDE_DIRS := \
67 $(LOCAL_PATH) \
68 $(LOCAL_PATH)/include/drm
69
70LOCAL_C_INCLUDES := \
71 $(LOCAL_PATH)/include/drm
72
73LOCAL_CFLAGS := \
74 $(common_CFLAGS)
75
76include $(LIBDRM_COMMON_MK)
77include $(BUILD_SHARED_LIBRARY)
78
79
80ifneq ($(TARGET_USE_PRIVATE_LIBDRM),true)
81
82# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
83include $(LOCAL_PATH)/Makefile.sources
84
85common_CFLAGS := \
86 -Wno-enum-conversion \
87 -Wno-pointer-arith \
88 -Wno-sign-compare \
89 -Wno-tautological-compare
90
91# Static library for the device (recovery)
92include $(CLEAR_VARS)
93
43LOCAL_MODULE := libdrm 94LOCAL_MODULE := libdrm
95LOCAL_VENDOR_MODULE := true
44 96
45LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES)) 97LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES))
46LOCAL_EXPORT_C_INCLUDE_DIRS := \ 98LOCAL_EXPORT_C_INCLUDE_DIRS := \
@@ -77,4 +129,4 @@ include $(LIBDRM_COMMON_MK)
77include $(BUILD_SHARED_LIBRARY) 129include $(BUILD_SHARED_LIBRARY)
78 130
79include $(call all-makefiles-under,$(LOCAL_PATH)) 131include $(call all-makefiles-under,$(LOCAL_PATH))
80endif 132endif # 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)
5include $(LOCAL_PATH)/Makefile.sources 5include $(LOCAL_PATH)/Makefile.sources
6 6
7LOCAL_MODULE := libdrm_amdgpu 7LOCAL_MODULE := libdrm_amdgpu
8 8LOCAL_VENDOR_MODULE := true
9LOCAL_SHARED_LIBRARIES := libdrm 9LOCAL_SHARED_LIBRARIES := libdrm
10 10
11LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) 11LOCAL_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)
5include $(LOCAL_PATH)/Makefile.sources 5include $(LOCAL_PATH)/Makefile.sources
6 6
7LOCAL_MODULE := libdrm_etnaviv 7LOCAL_MODULE := libdrm_etnaviv
8LOCAL_VENDOR_MODULE := true
8 9
9LOCAL_SHARED_LIBRARIES := libdrm 10LOCAL_SHARED_LIBRARIES := libdrm
10 11
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)
5include $(LOCAL_PATH)/Makefile.sources 5include $(LOCAL_PATH)/Makefile.sources
6 6
7LOCAL_MODULE := libdrm_freedreno 7LOCAL_MODULE := libdrm_freedreno
8 8LOCAL_VENDOR_MODULE := true
9LOCAL_SHARED_LIBRARIES := libdrm 9LOCAL_SHARED_LIBRARIES := libdrm
10 10
11LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) 11LOCAL_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)
28include $(LOCAL_PATH)/Makefile.sources 28include $(LOCAL_PATH)/Makefile.sources
29 29
30LOCAL_MODULE := libdrm_intel 30LOCAL_MODULE := libdrm_intel
31LOCAL_VENDOR_MODULE := true
31 32
32# Removed dependency to libpciaccess: not used on Android 33# Removed dependency to libpciaccess: not used on Android
33LOCAL_SHARED_LIBRARIES := libdrm 34LOCAL_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)
49endif 49endif
50 50
51LOCAL_MODULE := libkms 51LOCAL_MODULE := libkms
52LOCAL_VENDOR_MODULE := true
52LOCAL_SHARED_LIBRARIES := libdrm 53LOCAL_SHARED_LIBRARIES := libdrm
53 54
54include $(LIBDRM_COMMON_MK) 55include $(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)
5include $(LOCAL_PATH)/Makefile.sources 5include $(LOCAL_PATH)/Makefile.sources
6 6
7LOCAL_MODULE := libdrm_nouveau 7LOCAL_MODULE := libdrm_nouveau
8LOCAL_VENDOR_MODULE := true
8 9
9LOCAL_SHARED_LIBRARIES := libdrm 10LOCAL_SHARED_LIBRARIES := libdrm
10 11
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)
5include $(LOCAL_PATH)/Makefile.sources 5include $(LOCAL_PATH)/Makefile.sources
6 6
7LOCAL_MODULE := libdrm_radeon 7LOCAL_MODULE := libdrm_radeon
8LOCAL_VENDOR_MODULE := true
8 9
9LOCAL_SHARED_LIBRARIES := libdrm 10LOCAL_SHARED_LIBRARIES := libdrm
10 11
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 := \
13LOCAL_SHARED_LIBRARIES := \ 13LOCAL_SHARED_LIBRARIES := \
14 libdrm 14 libdrm
15 15
16LOCAL_VENDOR_MODULE := true
17
16include $(BUILD_SHARED_LIBRARY) 18include $(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 := \
13LOCAL_SHARED_LIBRARIES := \ 13LOCAL_SHARED_LIBRARIES := \
14 libdrm 14 libdrm
15 15
16LOCAL_VENDOR_MODULE := true
17
16include $(BUILD_SHARED_LIBRARY) 18include $(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))
7 7
8LOCAL_MODULE := modetest 8LOCAL_MODULE := modetest
9 9
10LOCAL_SHARED_LIBRARIES := libdrm 10LOCAL_SHARED_LIBRARIES := libdrm_platform
11LOCAL_STATIC_LIBRARIES := libdrm_util 11LOCAL_STATIC_LIBRARIES := libdrm_util
12 12
13LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. 13LOCAL_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)
7 7
8LOCAL_MODULE := planetest 8LOCAL_MODULE := planetest
9 9
10LOCAL_SHARED_LIBRARIES := libdrm 10LOCAL_SHARED_LIBRARIES := libdrm_platform
11 11
12include $(BUILD_EXECUTABLE) 12include $(BUILD_EXECUTABLE)
13 13
@@ -18,6 +18,6 @@ LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES
18 18
19LOCAL_MODULE := atomictest 19LOCAL_MODULE := atomictest
20 20
21LOCAL_SHARED_LIBRARIES := libdrm 21LOCAL_SHARED_LIBRARIES := libdrm_platform
22 22
23include $(BUILD_EXECUTABLE) 23include $(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)
7 7
8LOCAL_MODULE := proptest 8LOCAL_MODULE := proptest
9 9
10LOCAL_SHARED_LIBRARIES := libdrm 10LOCAL_SHARED_LIBRARIES := libdrm_platform
11LOCAL_STATIC_LIBRARIES := libdrm_util 11LOCAL_STATIC_LIBRARIES := libdrm_util
12 12
13LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. 13LOCAL_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
28 28
29LOCAL_MODULE := libdrm_util 29LOCAL_MODULE := libdrm_util
30 30
31LOCAL_SHARED_LIBRARIES := libdrm 31LOCAL_SHARED_LIBRARIES := libdrm_platform
32 32
33LOCAL_SRC_FILES := $(UTIL_FILES) 33LOCAL_SRC_FILES := $(UTIL_FILES)
34 34