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

Commit 812d3e98 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add support to disable adb root on userdebug builds based on product... 

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

Original change: https://android-review.googlesource.com/c/platform/build/+/3118597



Change-Id: Idc6a114fa58a832dac67000489c97d00ae1a4975
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e48e393a 878141b8

core/product.mk

+5 −0
Original line number Diff line number Diff line
@@ -488,6 +488,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)

core/sysprop_config.mk

+16 −2
Original line number Diff line number Diff line
@@ -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