From 3fc49fede8579902d68f7ecea9eca5dce2b9ff99 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Thu, 26 Apr 2018 13:19:53 +0800 Subject: [PATCH] Create system.prop for GSI Pi Properties for GSI Pi are not exactly the same as those for legacy GSI. Create a new gsi_system.prop for GSI Pi to avoid reusing legacy treble_system.prop used by legacy GSI (aosp_$arch_a(b) products). Bug: 78605339 Test: build and observe the system/build.prop Change-Id: I435e33558e244009af9a91a97580fd56591ff6f3 --- target/board/generic/BoardConfig.mk | 2 +- target/board/generic_arm64/BoardConfig.mk | 2 +- target/board/generic_x86/BoardConfig.mk | 5 +++++ target/board/generic_x86_64/BoardConfig.mk | 5 +++++ target/board/gsi_system.prop | 5 +++++ 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 target/board/gsi_system.prop diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 5614f4655d..cc06983e6d 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -62,7 +62,7 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) # GSI is always userdebug and needs a couple of properties taking precedence # over those set by the vendor. -TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop +TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop endif BOARD_VNDK_VERSION := current diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 824f6a7af0..6b766a87cf 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -91,7 +91,7 @@ BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) # GSI is always userdebug and needs a couple of properties taking precedence # over those set by the vendor. -TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop +TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop endif BOARD_VNDK_VERSION := current diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 2d00506d00..693aa6c91c 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -62,6 +62,11 @@ BOARD_SEPOLICY_DIRS += \ build/target/board/generic/sepolicy \ build/target/board/generic_x86/sepolicy +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) +# GSI is always userdebug and needs a couple of properties taking precedence +# over those set by the vendor. +TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop +endif BOARD_VNDK_VERSION := current # Enable A/B update diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index 5377fb15ff..21e4fc99b7 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -60,6 +60,11 @@ BOARD_SEPOLICY_DIRS += \ build/target/board/generic/sepolicy \ build/target/board/generic_x86/sepolicy +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) +# GSI is always userdebug and needs a couple of properties taking precedence +# over those set by the vendor. +TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop +endif BOARD_VNDK_VERSION := current # Wifi. diff --git a/target/board/gsi_system.prop b/target/board/gsi_system.prop new file mode 100644 index 0000000000..4b54aaf716 --- /dev/null +++ b/target/board/gsi_system.prop @@ -0,0 +1,5 @@ +# GSI always generate dex pre-opt in system image +ro.cp_system_other_odex=0 + +# GSI always disables adb authentication +ro.adb.secure=0