From 54032f0e5eb1f458c448421c2c54bc6afd1e293e Mon Sep 17 00:00:00 2001 From: Ian Pedowitz Date: Fri, 28 Jul 2017 07:57:32 -0700 Subject: [PATCH] master is now P Fixes: 64141010 Test: source build/envsetup.sh && lunch marlin-userdebug ============================================ PLATFORM_VERSION_CODENAME=P PLATFORM_VERSION=P TARGET_PRODUCT=marlin TARGET_BUILD_VARIANT=userdebug TARGET_BUILD_TYPE=release TARGET_PLATFORM_VERSION=PPR1 TARGET_BUILD_APPS= TARGET_ARCH=arm64 TARGET_ARCH_VARIANT=armv8-a TARGET_CPU_VARIANT=kryo TARGET_2ND_ARCH=arm TARGET_2ND_ARCH_VARIANT=armv7-a-neon TARGET_2ND_CPU_VARIANT=kryo HOST_ARCH=x86_64 HOST_2ND_ARCH=x86 HOST_OS=linux HOST_OS_EXTRA=Linux-4.4.0-79-generic-x86_64-Ubuntu-14.04.5-LTS HOST_CROSS_OS=windows HOST_CROSS_ARCH=x86 HOST_CROSS_2ND_ARCH=x86_64 HOST_BUILD_TYPE=release BUILD_ID=MASTER OUT_DIR=out AUX_OS_VARIANT_LIST= ============================================ Change-Id: I2d9019af8c4e24e34c743be85d4e0ff224de9d17 Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17 Merged-In: Ida774a3bc6fa7884e328eb70abb6b2cca7c32028 (cherry picked from commit b56fcf400f72ddd096df98993b015acef3487e2e) --- core/version_defaults.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 86f3efb88..9ff8f488a 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -38,8 +38,8 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE include $(INTERNAL_BUILD_ID_MAKEFILE) endif -DEFAULT_PLATFORM_VERSION := OPD1 -MIN_PLATFORM_VERSION := OPD1 +DEFAULT_PLATFORM_VERSION := PPR1 +MIN_PLATFORM_VERSION := PPR1 MAX_PLATFORM_VERSION := PPR1 ALLOWED_VERSIONS := $(call allowed-platform-versions,\ @@ -79,14 +79,10 @@ endif # When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION # please add that PLATFORM_VERSION to the following text file: # cts/tests/tests/os/assets/platform_versions.txt -PLATFORM_VERSION.OPD1 := 8.0.1 -PLATFORM_VERSION.OPM1 := OMR1 PLATFORM_VERSION.PPR1 := P # These are the current development codenames, if the build is not a final # release build. If this is a final release build, it is simply "REL". -PLATFORM_VERSION_CODENAME.OPD1 := REL -PLATFORM_VERSION_CODENAME.OPM1 := OMR1 PLATFORM_VERSION_CODENAME.PPR1 := P ifndef PLATFORM_VERSION