Merge "Create system.prop for GSI Pi" into pi-dev
am: 5646b804de
Change-Id: Ie9f26ef4e76905d8cf77de97242a39cef22cf082
This commit is contained in:
committed by
android-build-merger
commit
70299e3414
@@ -62,7 +62,7 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
|
|||||||
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
|
# GSI is always userdebug and needs a couple of properties taking precedence
|
||||||
# over those set by the vendor.
|
# 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
|
endif
|
||||||
BOARD_VNDK_VERSION := current
|
BOARD_VNDK_VERSION := current
|
||||||
|
|
||||||
|
@@ -91,7 +91,7 @@ BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
|
|||||||
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
|
# GSI is always userdebug and needs a couple of properties taking precedence
|
||||||
# over those set by the vendor.
|
# 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
|
endif
|
||||||
BOARD_VNDK_VERSION := current
|
BOARD_VNDK_VERSION := current
|
||||||
|
|
||||||
|
@@ -62,6 +62,11 @@ BOARD_SEPOLICY_DIRS += \
|
|||||||
build/target/board/generic/sepolicy \
|
build/target/board/generic/sepolicy \
|
||||||
build/target/board/generic_x86/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
|
BOARD_VNDK_VERSION := current
|
||||||
|
|
||||||
BUILD_BROKEN_DUP_RULES := false
|
BUILD_BROKEN_DUP_RULES := false
|
||||||
|
@@ -60,6 +60,11 @@ BOARD_SEPOLICY_DIRS += \
|
|||||||
build/target/board/generic/sepolicy \
|
build/target/board/generic/sepolicy \
|
||||||
build/target/board/generic_x86/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
|
BOARD_VNDK_VERSION := current
|
||||||
|
|
||||||
# Wifi.
|
# Wifi.
|
||||||
|
5
target/board/gsi_system.prop
Normal file
5
target/board/gsi_system.prop
Normal file
@@ -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
|
Reference in New Issue
Block a user