Merge "Adding adb_debug.prop"

am: 9da9c32e80

Change-Id: I4ec4dda0119195636e50eba133170b26377a13cd
This commit is contained in:
Bowgo Tsai 2019-03-22 06:16:36 -07:00 committed by android-build-merger
commit b25582f91b
2 changed files with 17 additions and 1 deletions

View file

@ -0,0 +1,12 @@
# Note: This file will be loaded with highest priority to override
# other system properties, if a special ramdisk with "/force_debuggable"
# is used and the device is unlocked.
# Disable adb authentication to allow test automation on user build GSI
ro.adb.secure=0
# Allow 'adb root' on user build GSI
ro.debuggable=1
# Introduce this property to indicate that init has loaded adb_debug.prop
ro.force.debuggable=1

View file

@ -51,13 +51,13 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += %.odex %.vdex %.art
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
system/etc/init/config/skip_mount.cfg \
system/etc/init/init.gsi.rc \
system/etc/adb_debug.prop \
# Exclude all files under system/product and system/product_services
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
system/product/% \
system/product_services/%
# Split selinux policy
PRODUCT_FULL_TREBLE_OVERRIDE := true
@ -97,3 +97,7 @@ PRODUCT_COPY_FILES += \
# Provide a libnfc-nci.conf to GSI product
PRODUCT_COPY_FILES += \
device/generic/common/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
# Allow 'adb root' on user build GSI
PRODUCT_COPY_FILES += \
build/make/target/product/gsi/adb_debug.prop:$(TARGET_COPY_OUT_SYSTEM)/etc/adb_debug.prop