StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding adb_debug.prop" am: 9da9c32e80

Browse Source 
am: b25582f91b

Change-Id: I088e2d613c337bb44c66e680c5c47148c4b4a9f9
This commit is contained in:
Bowgo Tsai
2019-03-22 06:23:12 -07:00
committed by android-build-merger
parent d3409149eb b25582f91b
commit 9a6455b071
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
target/product/gsi/adb_debug.prop Normal file
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

6
target/product/gsi_common.mk
View File

@@ -51,13 +51,13 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += %.odex %.vdex %.art
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
system/etc/init/config/skip_mount.cfg \ system/etc/init/config/skip_mount.cfg \
system/etc/init/init.gsi.rc \ system/etc/init/init.gsi.rc \
system/etc/adb_debug.prop \
# Exclude all files under system/product and system/product_services # Exclude all files under system/product and system/product_services
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
system/product/% \ system/product/% \
system/product_services/% system/product_services/%
# Split selinux policy # Split selinux policy
PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_FULL_TREBLE_OVERRIDE := true
@@ -97,3 +97,7 @@ PRODUCT_COPY_FILES += \
# Provide a libnfc-nci.conf to GSI product # Provide a libnfc-nci.conf to GSI product
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/generic/common/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf 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