From 7d9876b05ed45b96c1a715ff9e32293a8ea68bd0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 26 Mar 2010 11:22:03 -0700 Subject: [PATCH] Add separate language packs, for extra flexibility. This way, languages can be managed more carefully through the inheritance chain. Bug: 2546758 Change-Id: I14e3d4d60716355fa702cc77128e9da04e30a612 --- target/product/full.mk | 7 ++++--- target/product/languages_full.mk | 23 +++++++++++++++++++++++ target/product/languages_small.mk | 24 ++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 target/product/languages_full.mk create mode 100644 target/product/languages_small.mk diff --git a/target/product/full.mk b/target/product/full.mk index 5b95daa693..a86e89d791 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -22,9 +22,6 @@ PRODUCT_PACKAGES := \ VoiceDialer -# This is the list of locales included in AOSP builds -PRODUCT_LOCALES := en_US en_GB fr_FR it_IT de_DE es_ES - # Additional settings used in all AOSP builds PRODUCT_PROPERTY_OVERRIDES := \ keyguard.no_require_sim=true \ @@ -41,6 +38,10 @@ PRODUCT_COPY_FILES := \ # on smaller devices. $(call inherit-product, frameworks/base/data/sounds/OriginalAudio.mk) +# Get a list of languages. We use the small list to save space +# on smaller devices. +$(call inherit-product, build/target/product/languages_small.mk) + $(call inherit-product, build/target/product/generic.mk) # Overrides diff --git a/target/product/languages_full.mk b/target/product/languages_full.mk new file mode 100644 index 0000000000..6c49c794d0 --- /dev/null +++ b/target/product/languages_full.mk @@ -0,0 +1,23 @@ +# +# 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 that just contains a list of languages. +# It helps in situations where laugnages must come first in the list, +# mostly because screen densities interfere with the list of locales and +# the system misbehaves when a density is the first locale. + +# Those are all the locales that have translations. +PRODUCT_LOCALES := en_US en_GB fr_FR it_IT es_ES es_US de_DE nl_NL cs_CZ pl_PL zh_TW zh_CN ru_RU ko_KR nb_NO pt_PT pt_BR da_DK el_GR sv_SE tr_TR ja_JP diff --git a/target/product/languages_small.mk b/target/product/languages_small.mk new file mode 100644 index 0000000000..d695ca8dae --- /dev/null +++ b/target/product/languages_small.mk @@ -0,0 +1,24 @@ +# +# 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 that just contains a list of languages. +# It helps in situations where laugnages must come first in the list, +# mostly because screen densities interfere with the list of locales and +# the system misbehaves when a density is the first locale. + +# This is the list of languages that originally shipped on ADP1 + +PRODUCT_LOCALES := en_US en_GB fr_FR it_IT de_DE es_ES -- GitLab