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

Deprecate ADDITIONAL_DEFAULT_PROPERTIES

Browse Source 
As we merge default.prop into build.prop, we don't need to distinguish
ADDITIONAL_DEFAULT_PROPERTIES and ADDITIONAL_BUILD_PROPERTIES. Deprecate
the former in favor of the latter.

Bug: 117892318
Test: m
Change-Id: I80341c2e05d70821396202dc9e94104625ebf024
This commit is contained in:
Jiyong Park
2020-05-18 14:38:51 +09:00
parent e134686bca
commit 80f164c0b3
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/main.mk
View File

@@ -115,7 +115,7 @@ endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Validate ADDITIONAL_DEFAULT_PROPERTIES. # Validate ADDITIONAL_DEFAULT_PROPERTIES.
ifneq ($(ADDITIONAL_DEFAULT_PROPERTIES),) ifneq ($(ADDITIONAL_DEFAULT_PROPERTIES),)
$(error ADDITIONAL_DEFAULT_PROPERTIES must not be set before here: $(ADDITIONAL_DEFAULT_PROPERTIES)) $(error ADDITIONAL_DEFAULT_PROPERTIES is deprecated)
endif endif
# #
@@ -207,9 +207,9 @@ $(KATI_obsolete_var PRODUCT_FULL_TREBLE,\
# Sets ro.actionable_compatible_property.enabled to know on runtime whether the whitelist # Sets ro.actionable_compatible_property.enabled to know on runtime whether the whitelist
# of actionable compatible properties is enabled or not. # of actionable compatible properties is enabled or not.
ifeq ($(PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE),true) ifeq ($(PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE),true)
ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=false ADDITIONAL_BUILD_PROPERTIES += ro.actionable_compatible_property.enabled=false
else else
ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY} ADDITIONAL_BUILD_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY}
endif endif
# Add the system server compiler filter if they are specified for the product. # Add the system server compiler filter if they are specified for the product.
@@ -229,7 +229,7 @@ endif
# #
# It then uses ${ro.postinstall.fstab.prefix}/etc/fstab.postinstall to # It then uses ${ro.postinstall.fstab.prefix}/etc/fstab.postinstall to
# mount system_other partition. # mount system_other partition.
ADDITIONAL_DEFAULT_PROPERTIES += ro.postinstall.fstab.prefix=/system ADDITIONAL_BUILD_PROPERTIES += ro.postinstall.fstab.prefix=/system
# Set ro.product.vndk.version to know the VNDK version required by product # Set ro.product.vndk.version to know the VNDK version required by product
# modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value # modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value
@@ -261,11 +261,11 @@ enable_target_debugging := true
tags_to_install := tags_to_install :=
ifneq (,$(user_variant)) ifneq (,$(user_variant))
# Target is secure in user builds. # Target is secure in user builds.
ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1 ADDITIONAL_BUILD_PROPERTIES += ro.secure=1
ADDITIONAL_DEFAULT_PROPERTIES += security.perf_harden=1 ADDITIONAL_BUILD_PROPERTIES += security.perf_harden=1
ifeq ($(user_variant),user) ifeq ($(user_variant),user)
ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1 ADDITIONAL_BUILD_PROPERTIES += ro.adb.secure=1
endif endif
ifeq ($(user_variant),userdebug) ifeq ($(user_variant),userdebug)
@@ -277,25 +277,25 @@ ifneq (,$(user_variant))
endif endif
# Disallow mock locations by default for user builds # Disallow mock locations by default for user builds
ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0 ADDITIONAL_BUILD_PROPERTIES += ro.allow.mock.location=0
else # !user_variant else # !user_variant
# Turn on checkjni for non-user builds. # Turn on checkjni for non-user builds.
ADDITIONAL_BUILD_PROPERTIES += ro.kernel.android.checkjni=1 ADDITIONAL_BUILD_PROPERTIES += ro.kernel.android.checkjni=1
# Set device insecure for non-user builds. # Set device insecure for non-user builds.
ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0 ADDITIONAL_BUILD_PROPERTIES += ro.secure=0
# Allow mock locations by default for non user builds # Allow mock locations by default for non user builds
ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=1 ADDITIONAL_BUILD_PROPERTIES += ro.allow.mock.location=1
endif # !user_variant endif # !user_variant
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_DEFAULT_PROPERTIES += ro.debuggable=1 ADDITIONAL_BUILD_PROPERTIES += ro.debuggable=1
# Enable Dalvik lock contention logging. # Enable Dalvik lock contention logging.
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.lockprof.threshold=500 ADDITIONAL_BUILD_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_DEFAULT_PROPERTIES += ro.debuggable=0 ADDITIONAL_BUILD_PROPERTIES += ro.debuggable=0
endif # !enable_target_debugging endif # !enable_target_debugging
## eng ## ## eng ##
@@ -388,8 +388,6 @@ endif
# Strip and readonly a few more variables so they won't be modified. # Strip and readonly a few more variables so they won't be modified.
$(readonly-final-product-vars) $(readonly-final-product-vars)
ADDITIONAL_DEFAULT_PROPERTIES := $(strip $(ADDITIONAL_DEFAULT_PROPERTIES))
.KATI_READONLY := ADDITIONAL_DEFAULT_PROPERTIES
ADDITIONAL_BUILD_PROPERTIES := $(strip $(ADDITIONAL_BUILD_PROPERTIES)) ADDITIONAL_BUILD_PROPERTIES := $(strip $(ADDITIONAL_BUILD_PROPERTIES))
.KATI_READONLY := ADDITIONAL_BUILD_PROPERTIES .KATI_READONLY := ADDITIONAL_BUILD_PROPERTIES
ADDITIONAL_PRODUCT_PROPERTIES := $(strip $(ADDITIONAL_PRODUCT_PROPERTIES)) ADDITIONAL_PRODUCT_PROPERTIES := $(strip $(ADDITIONAL_PRODUCT_PROPERTIES))

1
core/sysprop.mk
View File

@@ -118,7 +118,6 @@ ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_BUILD_PROP_TARGET)
# TODO(b/117892318) merge DEFAULT into BUILD # TODO(b/117892318) merge DEFAULT into BUILD
FINAL_DEFAULT_PROPERTIES := \ FINAL_DEFAULT_PROPERTIES := \
$(call collapse-pairs, $(ADDITIONAL_DEFAULT_PROPERTIES)) \
$(call collapse-pairs, $(PRODUCT_SYSTEM_DEFAULT_PROPERTIES)) $(call collapse-pairs, $(PRODUCT_SYSTEM_DEFAULT_PROPERTIES))
FINAL_DEFAULT_PROPERTIES := $(call uniq-pairs-by-first-component, \ FINAL_DEFAULT_PROPERTIES := $(call uniq-pairs-by-first-component, \
$(FINAL_DEFAULT_PROPERTIES),=) $(FINAL_DEFAULT_PROPERTIES),=)