diff options
| author | SzuWei Lin <szuweilin@google.com> | 2019-02-15 14:18:35 +0800 |
|---|---|---|
| committer | SzuWei Lin <szuweilin@google.com> | 2019-02-15 14:34:53 +0800 |
| commit | fd6d294c2bcd4bba5850fda22a3fb668b453aabf (patch) | |
| tree | fac419c12513b1b56b3b96120ea3d17e6653dc72 | |
| parent | 1b082c3e05dc8efe38a524a7edc0c67e836b6498 (diff) | |
| download | build-fd6d294c2bcd4bba5850fda22a3fb668b453aabf.tar.gz | |
Fix booting problem on GSI with user build
GSI doesn't include gsi_system.prop on user build, and cause some
devices cannot boot GSI with user build. Some properies in
gsi_system.prop do not suitable for user build, the patch create
a new gsi_system_user.prop for GSI user build.
Bug: 124479721
Test: boot aosp_arm64-user on a blueline device.
Change-Id: Ide2bdc8e8733817afb832b50b28807768e22f011
| -rw-r--r-- | target/board/BoardConfigGsiCommon.mk | 4 | ||||
| -rw-r--r-- | target/board/gsi_system_user.prop | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 1037eec7cd..0c144f79a4 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -49,9 +49,9 @@ BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 # GSI specific System Properties 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 +else +TARGET_SYSTEM_PROP := build/make/target/board/gsi_system_user.prop endif # Set this to create /cache mount point for non-A/B devices that mounts /cache. diff --git a/target/board/gsi_system_user.prop b/target/board/gsi_system_user.prop new file mode 100644 index 0000000000..1aa553b6a3 --- /dev/null +++ b/target/board/gsi_system_user.prop @@ -0,0 +1,5 @@ +# GSI always generate dex pre-opt in system image +ro.cp_system_other_odex=0 + +# TODO(b/78105955): disable privapp_permissions checking before the bug solved +ro.control_privapp_permissions=disable |