openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp 

Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
This commit is contained in:
Narayan Kamath 2015-01-22 18:53:59 +00:00
parent 30a0031e43 8f5fc9e246
commit 675a726fe4
3 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CleanSpec.mk
View File

@ -325,6 +325,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
# Remove ro.product.locale.language/country and add ro.product.locale
# instead.
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

32
core/Makefile
View File

@ -156,29 +156,12 @@ else
BUILD_DISPLAY_ID := $(build_desc) BUILD_DISPLAY_ID := $(build_desc)
endif endif
# Whether there is default locale set in PRODUCT_PROPERTY_OVERRIDES # Accepts a whitespace separated list of product locales such as
product_property_override_locale_language := $(strip \ # (en_US en_AU en_GB...) and returns the first locale in the list with
$(patsubst ro.product.locale.language=%,%,\ # underscores replaced with hyphens. In the example above, this will
$(filter ro.product.locale.language=%,$(PRODUCT_PROPERTY_OVERRIDES)))) # return "en-US".
product_property_overrides_locale_region := $(strip \ define get-default-product-locale
$(patsubst ro.product.locale.region=%,%,\ $(strip $(subst _,-, $(firstword $(1))))
$(filter ro.product.locale.region=%,$(PRODUCT_PROPERTY_OVERRIDES))))
# Selects the first locale in the list given as the argument,
# and splits it into language and region, which each may be
# empty.
define default-locale
$(subst _, , $(firstword $(1)))
endef
# Selects the first locale in the list given as the argument
# and returns the language (or the region), if it's not set in PRODUCT_PROPERTY_OVERRIDES;
# Return empty string if it's already set in PRODUCT_PROPERTY_OVERRIDES.
define default-locale-language
$(if $(product_property_override_locale_language),,$(word 1, $(call default-locale, $(1))))
endef
define default-locale-region
$(if $(product_property_overrides_locale_region),,$(word 2, $(call default-locale, $(1))))
endef endef
BUILDINFO_SH := build/tools/buildinfo.sh BUILDINFO_SH := build/tools/buildinfo.sh
@ -204,8 +187,7 @@ endif
TARGET_DEVICE="$(TARGET_DEVICE)" \ TARGET_DEVICE="$(TARGET_DEVICE)" \
PRODUCT_NAME="$(TARGET_PRODUCT)" \ PRODUCT_NAME="$(TARGET_PRODUCT)" \
PRODUCT_BRAND="$(PRODUCT_BRAND)" \ PRODUCT_BRAND="$(PRODUCT_BRAND)" \
PRODUCT_DEFAULT_LANGUAGE="$(call default-locale-language,$(PRODUCT_LOCALES))" \ PRODUCT_DEFAULT_LOCALE="$(call get-default-product-locale,$(PRODUCT_LOCALES))" \
PRODUCT_DEFAULT_REGION="$(call default-locale-region,$(PRODUCT_LOCALES))" \
PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \ PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \
PRODUCT_MODEL="$(PRODUCT_MODEL)" \ PRODUCT_MODEL="$(PRODUCT_MODEL)" \
PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \ PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

7
tools/buildinfo.sh
View File

@ -36,11 +36,8 @@ echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT"
echo "ro.product.cpu.abilist64=$TARGET_CPU_ABI_LIST_64_BIT" echo "ro.product.cpu.abilist64=$TARGET_CPU_ABI_LIST_64_BIT"
echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER" echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER"
if [ -n "$PRODUCT_DEFAULT_LANGUAGE" ] ; then if [ -n "$PRODUCT_DEFAULT_LOCALE" ] ; then
echo "ro.product.locale.language=$PRODUCT_DEFAULT_LANGUAGE" echo "ro.product.locale=$PRODUCT_DEFAULT_LOCALE"
fi
if [ -n "$PRODUCT_DEFAULT_REGION" ] ; then
echo "ro.product.locale.region=$PRODUCT_DEFAULT_REGION"
fi fi
echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS" echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS"
echo "ro.board.platform=$TARGET_BOARD_PLATFORM" echo "ro.board.platform=$TARGET_BOARD_PLATFORM"