Some properties are set as optional am: 19746f4686
Original change: https://android-review.googlesource.com/c/platform/build/+/1344823 Change-Id: I508c0eb6ad7fd6f2c15e638a3d0e623a5ef0022c
This commit is contained in:
@@ -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 += \
|
||||||
|
@@ -43,8 +43,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
|
||||||
|
@@ -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 \
|
||||||
|
@@ -84,6 +84,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
|
||||||
|
@@ -74,7 +74,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 += \
|
||||||
|
Reference in New Issue
Block a user