From 2cdd0ab7b8f81a4741f0fc4239ff858abf22fcfb Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Sat, 3 Mar 2012 22:53:06 +0100 Subject: Fix inheritance of PRODUCT_PROPERTY_OVERRIDES for CM audio files Otherwise the ones set in CM vendor will be overridden by these. Change-Id: I3f87dfd009d8ddfd48972c15770599742b12c4af --- target/product/core.mk | 4 ---- target/product/full_base.mk | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'target') diff --git a/target/product/core.mk b/target/product/core.mk index 831298a..8c72fb8 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -18,10 +18,6 @@ PRODUCT_BRAND := generic PRODUCT_DEVICE := generic PRODUCT_NAME := core -PRODUCT_PROPERTY_OVERRIDES := \ - ro.config.notification_sound=OnTheHunt.ogg \ - ro.config.alarm_alert=Alarm_Classic.ogg - PRODUCT_PACKAGES += \ ApplicationsProvider \ BackupRestoreConfirmation \ diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 2aef5e7..947cb76 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -43,9 +43,7 @@ PRODUCT_PACKAGES += \ # Additional settings used in all AOSP builds PRODUCT_PROPERTY_OVERRIDES := \ - ro.com.android.dateformat=MM-dd-yyyy \ - ro.config.ringtone=Ring_Synth_04.ogg \ - ro.config.notification_sound=pixiedust.ogg + ro.com.android.dateformat=MM-dd-yyyy # Put en_US first in the list, so make it default. PRODUCT_LOCALES := en_US -- cgit v1.1