Merge "Set the AOSP master to be API level 16"
This commit is contained in:
@@ -53,7 +53,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)"
|
|||||||
# intermediate builds). During development, this number remains at the
|
# intermediate builds). During development, this number remains at the
|
||||||
# SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
|
# SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
|
||||||
# the code-name of the new development work.
|
# the code-name of the new development work.
|
||||||
PLATFORM_SDK_VERSION := 15
|
PLATFORM_SDK_VERSION := 16
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
|
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
|
||||||
@@ -96,4 +96,3 @@ ifeq "" "$(BUILD_NUMBER)"
|
|||||||
# anyone trying to parse it as an integer will probably get "0".
|
# anyone trying to parse it as an integer will probably get "0".
|
||||||
BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S)
|
BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user