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

Commit 89660704 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

Revert "Adding adb_debug.prop" 

This reverts commit a280a66b.

/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
parent 967105ad

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -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)/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

# ************************************************

target/product/gsi/adb_debug.prop

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
# 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

target/product/gsi_common.mk

+1 −5
Original line number Diff line number Diff line
@@ -50,13 +50,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
@@ -92,7 +92,3 @@ 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