Merge "Fix booting problem on GSI with user build"

am: b41ab14b1e

Change-Id: I5502ef27c48600144af42a5972dce3efd864efb2
This commit is contained in:
SzuWei Lin 2019-02-15 02:47:11 -08:00 committed by android-build-merger
commit 3e985e9b10
2 changed files with 7 additions and 2 deletions

View File

@ -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.

View File

@ -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