Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b41ab14b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix booting problem on GSI with user build"

parents fc35e5aa fd6d294c
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -49,9 +49,9 @@ BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1


# GSI specific System Properties
# GSI specific System Properties
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
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
TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop
else
TARGET_SYSTEM_PROP := build/make/target/board/gsi_system_user.prop
endif
endif


# Set this to create /cache mount point for non-A/B devices that mounts /cache.
# Set this to create /cache mount point for non-A/B devices that mounts /cache.
+5 −0
Original line number Original line Diff line number Diff line
# 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