tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support to disable adb root on userdebug builds based on product config

Browse source 
Test: manually verify
Bug: 345480978
Change-Id: I00cf7d30f66137055ed0aa495bf3d98143c391b7
This commit is contained in:
Joe Onorato 2024-06-07 16:04:17 -07:00
parent fc19715ebf
commit d4b4224e02
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/product.mk
View file

@ -491,6 +491,11 @@ _product_single_value_vars += PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION
# Enables 16KB developer option for device if set.
_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
_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))
enable_target_debugging := true
enable_dalvik_lock_contention_logging := true
ifneq (,$(user_variant))
# Target is secure in user builds.
ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=1
@ -207,6 +208,13 @@ ifneq (,$(user_variant))
ifneq ($(user_variant),userdebug)
# Disable debugging in plain user builds.
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
# Disallow mock locations by default for user builds
@ -221,16 +229,22 @@ else # !user_variant
ADDITIONAL_SYSTEM_PROPERTIES += ro.allow.mock.location=1
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)))
# Target is more debuggable and adbd is on by default
ADDITIONAL_SYSTEM_PROPERTIES += ro.debuggable=1
# Enable Dalvik lock contention logging.
ADDITIONAL_SYSTEM_PROPERTIES += dalvik.vm.lockprof.threshold=500
else # !enable_target_debugging
# Target is less debuggable and adbd is off by default
ADDITIONAL_SYSTEM_PROPERTIES += ro.debuggable=0
endif # !enable_target_debugging
enable_target_debugging:=
enable_dalvik_lock_contention_logging:=
ifneq ($(filter sdk sdk_addon,$(MAKECMDGOALS)),)
_is_sdk_build := true
endif