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 b161297d to lmp-mr1-ub-dev 

Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
This commit is contained in:
Zach Jang 2015-09-21 13:00:04 -07:00
parent 17aa06f6fe b161297d4b
commit f694d37895
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CleanSpec.mk
View File

@ -354,6 +354,8 @@ $(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/*)
# Added new build props
$(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

2
core/Makefile
View File

@ -196,6 +196,8 @@ endif
BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \
BUILD_NUMBER="$(BUILD_NUMBER)" \ BUILD_NUMBER="$(BUILD_NUMBER)" \
PLATFORM_VERSION="$(PLATFORM_VERSION)" \ PLATFORM_VERSION="$(PLATFORM_VERSION)" \
PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \
PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \
PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \ PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \
PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \ PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \
PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \ PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \

17
core/version_defaults.mk
View File

@ -24,6 +24,7 @@
# DEFAULT_APP_TARGET_SDK # DEFAULT_APP_TARGET_SDK
# BUILD_ID # BUILD_ID
# BUILD_NUMBER # BUILD_NUMBER
# SECURITY_PATCH
# #
# Look for an optional file containing overrides of the defaults, # Look for an optional file containing overrides of the defaults,
@ -67,6 +68,22 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)"
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME) PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
endif endif
ifeq "" "$(PLATFORM_SECURITY_PATCH)"
# Used to indicate the security patch that has been applied to the device.
# Can be an arbitrary string, but must be a single word.
#
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2015-11-01
endif
ifeq "" "$(PLATFORM_BASE_OS)"
# Used to indicate the base os applied to the device.
# Can be an arbitrary string, but must be a single word.
#
# If there is no $PLATFORM_BASE_OS set, keep it empty.
PLATFORM_BASE_OS :=
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)" ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
# This is the default minSdkVersion and targetSdkVersion to use for # This is the default minSdkVersion and targetSdkVersion to use for
# all .apks created by the build system. It can be overridden by explicitly # all .apks created by the build system. It can be overridden by explicitly

2
tools/buildinfo.sh
View File

@ -10,6 +10,8 @@ echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION"
echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME" echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME"
echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES" echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES"
echo "ro.build.version.release=$PLATFORM_VERSION" echo "ro.build.version.release=$PLATFORM_VERSION"
echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH"
echo "ro.build.version.base_os=$PLATFORM_BASE_OS"
echo "ro.build.date=`date`" echo "ro.build.date=`date`"
echo "ro.build.date.utc=`date +%s`" echo "ro.build.date.utc=`date +%s`"
echo "ro.build.type=$TARGET_BUILD_TYPE" echo "ro.build.type=$TARGET_BUILD_TYPE"