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

Commit 347f1ccf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adding adb_debug.prop into debug ramdisk" into qt-dev

parents ec78cca3 6386c320

init/Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true 
LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)

LOCAL_UNSTRIPPED_PATH := $(TARGET_RAMDISK_OUT_UNSTRIPPED)



# Install adb_debug.prop into debug ramdisk.

# This allows adb root on a user build, when debug ramdisk is used.

LOCAL_REQUIRED_MODULES := \

   adb_debug.prop \



# Set up the same mount points on the ramdisk that system-as-root contains.

LOCAL_POST_INSTALL_CMD := mkdir -p \

    $(TARGET_RAMDISK_OUT)/apex \

rootdir/Android.mk

+9 −0
Original line number Diff line number Diff line
@@ -377,4 +377,13 @@ $(LOCAL_BUILT_MODULE): 
	$(hide) $(foreach lib,$(PRIVATE_VNDK_SAMEPROCESS_LIBRARIES), \

		echo $(lib).so >> $@;)



#######################################

# adb_debug.prop in debug ramdisk

include $(CLEAR_VARS)

LOCAL_MODULE := adb_debug.prop

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_DEBUG_RAMDISK_OUT)

include $(BUILD_PREBUILT)



include $(call all-makefiles-under,$(LOCAL_PATH))

rootdir/adb_debug.prop

0 → 100644
+12 −0
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