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

Merge "Add support to disable adb root on userdebug builds based on product config" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-08 00:26:20 +00:00
committed by Gerrit Code Review
parent 7120481a00 d4b4224e02
commit 878141b810
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/product.mk
View File

@@ -488,6 +488,11 @@ _product_single_value_vars += PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION
# Enables 16KB developer option for device if set. # Enables 16KB developer option for device if set.
_product_single_value_vars += PRODUCT_16K_DEVELOPER_OPTION _product_single_value_vars += PRODUCT_16K_DEVELOPER_OPTION
# If set, adb root will be disabled (really ro.debuggable=0) in userdebug
# builds. It's already off disabled in user builds. Eng builds are unaffected
# by this flag.
_product_single_value_vars += PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG
.KATI_READONLY := _product_single_value_vars _product_list_vars .KATI_READONLY := _product_single_value_vars _product_list_vars
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars) _product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

18
core/sysprop_config.mk
View File

@@ -195,6 +195,7 @@ endif
user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT)) user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))
enable_target_debugging := true enable_target_debugging := true
enable_dalvik_lock_contention_logging := true
ifneq (,$(user_variant)) ifneq (,$(user_variant))
# Target is secure in user builds. # Target is secure in user builds.
ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=1 ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=1
@@ -207,6 +208,13 @@ ifneq (,$(user_variant))
ifneq ($(user_variant),userdebug) ifneq ($(user_variant),userdebug)
# Disable debugging in plain user builds. # Disable debugging in plain user builds.
enable_target_debugging := enable_target_debugging :=
enable_dalvik_lock_contention_logging :=
else
# Disable debugging in userdebug builds if PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG
# is set.
ifneq (,$(strip $(PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG)))
enable_target_debugging :=
endif
endif endif
# Disallow mock locations by default for user builds # Disallow mock locations by default for user builds
@@ -221,16 +229,22 @@ else # !user_variant
ADDITIONAL_SYSTEM_PROPERTIES += ro.allow.mock.location=1 ADDITIONAL_SYSTEM_PROPERTIES += ro.allow.mock.location=1
endif # !user_variant endif # !user_variant
ifeq (true,$(strip $(enable_dalvik_lock_contention_logging)))
# Enable Dalvik lock contention logging.
ADDITIONAL_SYSTEM_PROPERTIES += dalvik.vm.lockprof.threshold=500
endif # !enable_dalvik_lock_contention_logging
ifeq (true,$(strip $(enable_target_debugging))) ifeq (true,$(strip $(enable_target_debugging)))
# Target is more debuggable and adbd is on by default # Target is more debuggable and adbd is on by default
ADDITIONAL_SYSTEM_PROPERTIES += ro.debuggable=1 ADDITIONAL_SYSTEM_PROPERTIES += ro.debuggable=1
# Enable Dalvik lock contention logging.
ADDITIONAL_SYSTEM_PROPERTIES += dalvik.vm.lockprof.threshold=500
else # !enable_target_debugging else # !enable_target_debugging
# Target is less debuggable and adbd is off by default # Target is less debuggable and adbd is off by default
ADDITIONAL_SYSTEM_PROPERTIES += ro.debuggable=0 ADDITIONAL_SYSTEM_PROPERTIES += ro.debuggable=0
endif # !enable_target_debugging endif # !enable_target_debugging
enable_target_debugging:=
enable_dalvik_lock_contention_logging:=
ifneq ($(filter sdk sdk_addon,$(MAKECMDGOALS)),) ifneq ($(filter sdk sdk_addon,$(MAKECMDGOALS)),)
_is_sdk_build := true _is_sdk_build := true
endif endif