diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-22 14:41:55 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-22 15:00:24 -0700 |
commit | dd46ad41ff300708ce2fd143dc629c65f8c7c5f5 (patch) | |
tree | e630f933ce15d3f9db7f70a263b61dbbb0222a37 | |
parent | e67944ee126df1454ff9525927e3cc552c617ab3 (diff) | |
download | build-dd46ad41ff300708ce2fd143dc629c65f8c7c5f5.zip build-dd46ad41ff300708ce2fd143dc629c65f8c7c5f5.tar.gz build-dd46ad41ff300708ce2fd143dc629c65f8c7c5f5.tar.bz2 |
Clean up full config - DO NOT MERGE
This splits the existing full.mk in two parts:
-One is the device-independent full_base.mk
-The other is the emulator-specific device.mk
This way we'll be able to inherit from full_base.mk
for on-device builds without any emulator-specific
files getting in the way.
Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
-rw-r--r-- | target/board/generic/device.mk | 26 | ||||
-rw-r--r-- | target/product/full.mk | 40 | ||||
-rw-r--r-- | target/product/full_base.mk | 48 |
3 files changed, 78 insertions, 36 deletions
diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk new file mode 100644 index 0000000..0b4dc27 --- /dev/null +++ b/target/board/generic/device.mk @@ -0,0 +1,26 @@ +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This is a build configuration for the product aspects that +# are specific to the emulator. + +PRODUCT_PROPERTY_OVERRIDES := \ + ro.ril.hsxpa=1 \ + ro.ril.gprsclass=10 + +PRODUCT_COPY_FILES := \ + development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ + development/data/etc/vold.conf:system/etc/vold.conf diff --git a/target/product/full.mk b/target/product/full.mk index a39c13b..6f8edea 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -19,43 +19,11 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -PRODUCT_PACKAGES := \ - OpenWnn \ - PinyinIME \ - VoiceDialer \ - libWnnEngDic \ - libWnnJpnDic \ - libwnndict - -# Additional settings used in all AOSP builds -PRODUCT_PROPERTY_OVERRIDES := \ - keyguard.no_require_sim=true \ - ro.com.android.dateformat=MM-dd-yyyy \ - ro.com.android.dataroaming=true \ - ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 - -PRODUCT_COPY_FILES := \ - development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ - development/data/etc/vold.conf:system/etc/vold.conf - -# Put en_US first in the list, so make it default. -PRODUCT_LOCALES := en_US - -# Pick up some sounds - stick with the short list to save space -# on smaller devices. -$(call inherit-product-if-exists, frameworks/base/data/sounds/OriginalAudio.mk) - -# Get the TTS language packs -$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk) - -# Get the list of languages. -$(call inherit-product, build/target/product/locales_full.mk) - -$(call inherit-product, build/target/product/generic.mk) +$(call inherit-product, build/target/board/generic/device.mk) +$(call inherit-product, build/target/product/full_base.mk) # Overrides PRODUCT_NAME := full -PRODUCT_BRAND := generic PRODUCT_DEVICE := generic -PRODUCT_MODEL := Full Android +PRODUCT_BRAND := Android +PRODUCT_MODEL := Full Android on Emulator diff --git a/target/product/full_base.mk b/target/product/full_base.mk new file mode 100644 index 0000000..2739a53 --- /dev/null +++ b/target/product/full_base.mk @@ -0,0 +1,48 @@ +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This is a build configuration for a full-featured build of the +# Open-Source part of the tree. This is a base configuration to +# bes used for AOSP builds on various target devices. + +PRODUCT_PACKAGES := \ + OpenWnn \ + PinyinIME \ + VoiceDialer \ + libWnnEngDic \ + libWnnJpnDic \ + libwnndict + +# Additional settings used in all AOSP builds +PRODUCT_PROPERTY_OVERRIDES := \ + keyguard.no_require_sim=true \ + ro.com.android.dateformat=MM-dd-yyyy \ + ro.com.android.dataroaming=true + +# Put en_US first in the list, to make it default. +PRODUCT_LOCALES := en_US + +# Pick up some sounds - stick with the short list to save space +# on smaller devices. +$(call inherit-product-if-exists, frameworks/base/data/sounds/OriginalAudio.mk) + +# Get the TTS language packs +$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk) + +# Get the list of languages. +$(call inherit-product, build/target/product/locales_full.mk) + +$(call inherit-product, build/target/product/generic.mk) |