From 0e7cde59c80c28b166f4fe099ac1d3f44ce4fb79 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Thu, 25 Jul 2024 02:45:53 +0000 Subject: [PATCH] Revert "Sync gen_build_prop.py to sysprop.mk" Revert submission 3184480-system_build_prop_soong Reason for revert: breaks ndk and mainline build Reverted changes: /q/submissionid:3184480-system_build_prop_soong Change-Id: I833aacf23bbe7cd16b6aad0b7d94a9b46a8192e4 --- scripts/gen_build_prop.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py index 56ce14fef..9ea56cbd2 100644 --- a/scripts/gen_build_prop.py +++ b/scripts/gen_build_prop.py @@ -279,7 +279,7 @@ def append_additional_system_props(args): config = args.config # Add the product-defined properties to the build properties. - if not config["PropertySplitEnabled"] or not config["VendorImageFileSystemType"]: + if config["PropertySplitEnabled"] or config["VendorImageFileSystemType"]: if "PRODUCT_PROPERTY_OVERRIDES" in config: props += config["PRODUCT_PROPERTY_OVERRIDES"] @@ -311,7 +311,6 @@ def append_additional_system_props(args): props.append("ro.postinstall.fstab.prefix=/system") enable_target_debugging = True - enable_dalvik_lock_contention_logging = True if config["BuildVariant"] == "user" or config["BuildVariant"] == "userdebug": # Target is secure in user builds. props.append("ro.secure=1") @@ -321,12 +320,6 @@ def append_additional_system_props(args): # Disable debugging in plain user builds. props.append("ro.adb.secure=1") enable_target_debugging = False - enable_dalvik_lock_contention_logging = False - else: - # Disable debugging in userdebug builds if PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG - # is set. - if config["ProductNotDebuggableInUserdebug"]: - enable_target_debugging = False # Disallow mock locations by default for user builds props.append("ro.allow.mock.location=0") @@ -338,11 +331,10 @@ def append_additional_system_props(args): # Allow mock locations by default for non user builds props.append("ro.allow.mock.location=1") - if enable_dalvik_lock_contention_logging: + if enable_target_debugging: # Enable Dalvik lock contention logging. props.append("dalvik.vm.lockprof.threshold=500") - if enable_target_debugging: # Target is more debuggable and adbd is on by default props.append("ro.debuggable=1") else: @@ -424,7 +416,7 @@ def append_additional_vendor_props(args): # This must not be defined for the non-GRF devices. # The values of the GRF properties will be verified by post_process_props.py if config["BoardShippingApiLevel"]: - props.append(f"ro.board.first_api_level={config['BoardShippingApiLevel']}") + props.append(f"ro.board.first_api_level={config['ProductShippingApiLevel']}") # Build system set BOARD_API_LEVEL to show the api level of the vendor API surface. # This must not be altered outside of build system. @@ -483,9 +475,6 @@ def append_additional_product_props(args): if config["NoBionicPageSizeMacro"]: props.append(f"ro.product.build.no_bionic_page_size_macro=true") - # This is a temporary system property that controls the ART module. The plan is - # to remove it by Aug 2025, at which time Mainline updates of the ART module - # will ignore it as well. # If the value is "default", it will be mangled by post_process_props.py. props.append(f"ro.dalvik.vm.enable_uffd_gc={config['EnableUffdGc']}")