diff options
author | Rob Herring | 2017-09-15 08:45:59 -0500 |
---|---|---|
committer | Rob Herring | 2017-10-09 09:22:35 -0500 |
commit | 011fd913b445b5e17148c37d169396c39eced3df (patch) | |
tree | a6852bf91516fe7d44261be3452c2fabd66d4cdd | |
parent | 2ecafcae8a215d9994fb26a122d97bcb5437c5e8 (diff) | |
download | external-libdrm-011fd913b445b5e17148c37d169396c39eced3df.tar.gz external-libdrm-011fd913b445b5e17148c37d169396c39eced3df.tar.xz external-libdrm-011fd913b445b5e17148c37d169396c39eced3df.zip |
Android: move libraries to /vendor
As part of Treble project in Android O, all the device specific files have
to be located in a separate vendor partition. This is done by setting
LOCAL_PROPRIETARY_MODULE (the name is misleading). This change will not
break existing platforms without a vendor partition as it will just move
files to /system/vendor.
Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r-- | Android.common.mk | 2 | ||||
-rw-r--r-- | amdgpu/Android.mk | 2 | ||||
-rw-r--r-- | data/Android.mk | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Android.common.mk b/Android.common.mk index b45ca10f..d487acb9 100644 --- a/Android.common.mk +++ b/Android.common.mk | |||
@@ -13,3 +13,5 @@ LOCAL_CFLAGS += \ | |||
13 | # Quiet down the build system and remove any .h files from the sources | 13 | # Quiet down the build system and remove any .h files from the sources |
14 | LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES)) | 14 | LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES)) |
15 | LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) | 15 | LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) |
16 | |||
17 | LOCAL_PROPRIETARY_MODULE := true | ||
diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk index 88d37651..ce273019 100644 --- a/amdgpu/Android.mk +++ b/amdgpu/Android.mk | |||
@@ -11,7 +11,7 @@ LOCAL_SHARED_LIBRARIES := libdrm | |||
11 | LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) | 11 | LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) |
12 | 12 | ||
13 | LOCAL_CFLAGS := \ | 13 | LOCAL_CFLAGS := \ |
14 | -DAMDGPU_ASIC_ID_TABLE=\"/system/etc/hwdata/amdgpu.ids\" \ | 14 | -DAMDGPU_ASIC_ID_TABLE=\"/vendor/etc/hwdata/amdgpu.ids\" \ |
15 | -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' $(LIBDRM_TOP)/data/amdgpu.ids) | 15 | -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' $(LIBDRM_TOP)/data/amdgpu.ids) |
16 | 16 | ||
17 | LOCAL_REQUIRED_MODULES := amdgpu.ids | 17 | LOCAL_REQUIRED_MODULES := amdgpu.ids |
diff --git a/data/Android.mk b/data/Android.mk index 3c1fd7c6..62013f0c 100644 --- a/data/Android.mk +++ b/data/Android.mk | |||
@@ -4,6 +4,7 @@ include $(CLEAR_VARS) | |||
4 | LOCAL_MODULE := amdgpu.ids | 4 | LOCAL_MODULE := amdgpu.ids |
5 | LOCAL_MODULE_TAGS := optional | 5 | LOCAL_MODULE_TAGS := optional |
6 | LOCAL_MODULE_CLASS := ETC | 6 | LOCAL_MODULE_CLASS := ETC |
7 | LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/hwdata | 7 | LOCAL_PROPRIETARY_MODULE := true |
8 | LOCAL_MODULE_RELATIVE_PATH := hwdata | ||
8 | LOCAL_SRC_FILES := $(LOCAL_MODULE) | 9 | LOCAL_SRC_FILES := $(LOCAL_MODULE) |
9 | include $(BUILD_PREBUILT) | 10 | include $(BUILD_PREBUILT) |