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

Some properties are set as optional

Browse Source 
Some properties that are designed to provide a safe default value are
explicitly set as optional using the 'a ?= b' syntax.

Bug: 117892318
Bug: 158735147
Test: m
Change-Id: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
This commit is contained in:
Jiyong Park
2020-06-22 20:15:55 +09:00
parent b1261aac33
commit dfb3937ce4
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
target/product/aosp_product.mk
View File

@@ -23,9 +23,9 @@ $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
# Additional settings used in all AOSP builds # Additional settings used in all AOSP builds
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.config.ringtone=Ring_Synth_04.ogg \ ro.config.ringtone?=Ring_Synth_04.ogg \
ro.config.notification_sound=pixiedust.ogg \ ro.config.notification_sound?=pixiedust.ogg \
ro.com.android.dataroaming=true \ ro.com.android.dataroaming?=true \
# More AOSP packages # More AOSP packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

4
target/product/full_base.mk
View File

@@ -44,8 +44,8 @@ PRODUCT_PACKAGES += \
# Additional settings used in all AOSP builds # Additional settings used in all AOSP builds
PRODUCT_VENDOR_PROPERTIES := \ PRODUCT_VENDOR_PROPERTIES := \
ro.config.ringtone=Ring_Synth_04.ogg \ ro.config.ringtone?=Ring_Synth_04.ogg \
ro.config.notification_sound=pixiedust.ogg ro.config.notification_sound?=pixiedust.ogg
# Put en_US first in the list, so make it default. # Put en_US first in the list, so make it default.
PRODUCT_LOCALES := en_US PRODUCT_LOCALES := en_US

4
target/product/full_base_telephony.mk
View File

@@ -20,8 +20,8 @@
# entirely appropriate to inherit from for on-device configurations. # entirely appropriate to inherit from for on-device configurations.
PRODUCT_VENDOR_PROPERTIES := \ PRODUCT_VENDOR_PROPERTIES := \
keyguard.no_require_sim=true \ keyguard.no_require_sim?=true \
ro.com.android.dataroaming=true ro.com.android.dataroaming?=true
PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES := \
device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \ device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \

6
target/product/handheld_system.mk
View File

@@ -83,6 +83,6 @@ PRODUCT_COPY_FILES += \
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.carrier=unknown \ ro.carrier?=unknown \
ro.config.notification_sound=OnTheHunt.ogg \ ro.config.notification_sound?=OnTheHunt.ogg \
ro.config.alarm_alert=Alarm_Classic.ogg ro.config.alarm_alert?=Alarm_Classic.ogg

2
target/product/media_system.mk
View File

@@ -75,7 +75,7 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
# On userdebug builds, collect more tombstones by default. # On userdebug builds, collect more tombstones by default.
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
tombstoned.max_tombstone_count=50 tombstoned.max_tombstone_count?=50
endif endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \