diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-23 16:30:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-23 16:30:24 +0000 |
| commit | 347f1ccf4bd3b98931027f5579566a7acfa49894 (patch) | |
| tree | 2aa8d8adc4bc034f22d9415001bd3cac415b5937 /rootdir | |
| parent | ec78cca331fa651890c10c2746c2d99f4c800322 (diff) | |
| parent | 6386c3207b335bd587e145c231c38ee98135847e (diff) | |
| download | system_core-347f1ccf4bd3b98931027f5579566a7acfa49894.tar.gz system_core-347f1ccf4bd3b98931027f5579566a7acfa49894.tar.bz2 system_core-347f1ccf4bd3b98931027f5579566a7acfa49894.zip | |
Merge "Adding adb_debug.prop into debug ramdisk" into qt-dev
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 9 | ||||
| -rw-r--r-- | rootdir/adb_debug.prop | 12 |
2 files changed, 21 insertions, 0 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index a97858a93..7ff1588b2 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -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)) diff --git a/rootdir/adb_debug.prop b/rootdir/adb_debug.prop new file mode 100644 index 000000000..37e2f2d71 --- /dev/null +++ b/rootdir/adb_debug.prop @@ -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 |