tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Adding adb_debug.prop"

Browse source 
This reverts commit a280a66b5a.

/init now switched to read adb_debug.prop from debug ramdisk instead
of GSI or other system.img. No need to keep the file in GSI.

See the following for more details:
  https://android-review.googlesource.com/c/platform/system/core/+/946517

Bug: 126493225
Test: tree hugger
Change-Id: I981db8e13216fbe0f066f4d3684ee149b1177d22
This commit is contained in:
Bowgo Tsai 2019-04-20 15:01:19 +08:00
parent 967105ada9
commit 8966070431
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CleanSpec.mk
View file

@ -622,6 +622,9 @@ $(call add-clean-step, find $(PRODUCT_OUT) -type f -name "generated_*_image_info
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libicu*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libicu*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl)
# Clean up adb_debug.propr
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/adb_debug.prop)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

12
target/product/gsi/adb_debug.prop
View file

@ -1,12 +0,0 @@
# 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

@ -50,13 +50,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
@ -92,7 +92,3 @@ 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