commit | 06533fef4ae77758ae94464040b8a1d49d53349c | [log] [tgz] |
---|---|---|
author | Bowgo Tsai <bowgotsai@google.com> | Mon Sep 02 18:17:02 2019 +0800 |
committer | Bowgo Tsai <bowgotsai@google.com> | Tue Sep 10 21:55:32 2019 +0800 |
tree | 0e06a1628eaf007f232d4a618d7e9af258a4fe89 | |
parent | 5242dc18bfd13164dcbb02280153d72af9508168 [diff] |
Moving GSI-specific properties to /system_ext We're now adding a core CSI system.img that is common across different targets. So GSI-specific things should be moved to /system_ext. Also renaming various generic*/system.prop to generic*/system_ext.prop. This is to put the customization into /system_ext/build.prop instead of /system/build.prop. Bug: 137711197 Test: boot a GSI on crosshatch, and checks the value of those properties Change-Id: Id344124280d5f4a6c10d390a9e8a4a50cc7f28fb
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 31d0bdf..4c783c0 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk
@@ -41,9 +41,9 @@ # GSI specific System Properties ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop +TARGET_SYSTEM_EXT_PROP := build/make/target/board/gsi_system_ext.prop else -TARGET_SYSTEM_PROP := build/make/target/board/gsi_system_user.prop +TARGET_SYSTEM_EXT_PROP := build/make/target/board/gsi_system_ext_user.prop endif # Set this to create /cache mount point for non-A/B devices that mounts /cache.
diff --git a/target/board/generic/system.prop b/target/board/generic/system_ext.prop similarity index 100% rename from target/board/generic/system.prop rename to target/board/generic/system_ext.prop
diff --git a/target/board/generic_arm64/system.prop b/target/board/generic_arm64/system_ext.prop similarity index 100% rename from target/board/generic_arm64/system.prop rename to target/board/generic_arm64/system_ext.prop
diff --git a/target/board/generic_x86/system.prop b/target/board/generic_x86/system_ext.prop similarity index 100% rename from target/board/generic_x86/system.prop rename to target/board/generic_x86/system_ext.prop
diff --git a/target/board/generic_x86_64/system.prop b/target/board/generic_x86_64/system_ext.prop similarity index 100% rename from target/board/generic_x86_64/system.prop rename to target/board/generic_x86_64/system_ext.prop
diff --git a/target/board/generic_x86_arm/system.prop b/target/board/generic_x86_arm/system_ext.prop similarity index 100% rename from target/board/generic_x86_arm/system.prop rename to target/board/generic_x86_arm/system_ext.prop
diff --git a/target/board/gsi_system.prop b/target/board/gsi_system_ext.prop similarity index 100% rename from target/board/gsi_system.prop rename to target/board/gsi_system_ext.prop
diff --git a/target/board/gsi_system_user.prop b/target/board/gsi_system_ext_user.prop similarity index 100% rename from target/board/gsi_system_user.prop rename to target/board/gsi_system_ext_user.prop