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

Merge "Revert "Adding adb_debug.prop"" am: db57997c72

Browse Source 
am: 3a4df557b0

Change-Id: I30d442f7e519684dfdb9824c02af5556d9218320
This commit is contained in:
Bowgo Tsai
2019-04-23 00:52:26 -07:00
committed by android-build-merger
parent 65feee7adb 3a4df557b0
commit bf23e32478
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CleanSpec.mk
View File

@@ -626,6 +626,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