Commit graph

449 commits

Author SHA1 Message Date
Ian Pedowitz
00283a6e80 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
(cherry picked from commit b56fcf400f)
2017-08-29 10:10:24 +08:00
Dan Albert
5ebfa32c53 Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES."
am: 577ff4730f

Change-Id: Ib42278524d19d1a464b9357b78c5fd05e6736e04
2017-08-03 02:27:41 +00:00
Dan Albert
cd38b86016 Add PLATFORM_VERSION_FUTURE_CODENAMES.
PLATFORM_VERSION_ALL_CODENAMES isn't actually all the code names, just
the ones active in our current target. We need the list of all targets
so we can validate code names in NDK stub templates even if they're in
the future. Unfortunately, all_codenames has been baked into
build.prop for ages, so we're stuck with this name. Improve the
comments and add PLATFORM_VERSION_FUTURE_CODENAMES to cover to cover
the future targets.

Test: make checkbuild
Test: check $ANDROID_PRODUCT_OUT/system/build.prop
Bug: None
Change-Id: I81fed6f761e5362ef3050be9d1e3fb17739feadd
2017-08-02 17:17:41 -07:00
Dan Willemsen
10e9d25035 Merge changes I863200b2,Ifdd9663b
am: 770a498e99

Change-Id: Id9e3dd9d5e8ac3d85d5203dd6430243d9daf01bf
2017-07-26 21:45:04 +00:00
Dan Willemsen
ce7f8dd15a Run uname -sm once, don't use python for HOST_OS_EXTRA
This saves 20-50ms for `lunch` (~7-10%), and double that for every build
execution.

Test: Check HOST_OS_EXTRA on Linux & Mac
Change-Id: I863200b2287c8867f40606237895b1d3ad91e1b3
2017-07-26 10:49:22 -07:00
Dan Willemsen
0596384adb Mark oc-dev-plus-aosp OPR1 as REL
It contains all of oc-dev, which has OPR1 marked as REL, so we should be
using API 26 instead of 'O'.

Test: Check PLATFORM_VERSION_CODENAME / PLATFORM_SDK_VERSION
Change-Id: I0e8f3b42b8ac60422f0a8b044de45ba03b0bcfcf
Merged-In: I036cc43c1f2aa5317ae1131dc31a1f96caa5081f
2017-06-16 15:02:51 -07:00
Adam Seaton
c5c1af423a Updating security string to 2017-08-05
am: d6e984f9e3

Change-Id: I0b15f09daedf3c57f479da7ccf126a6ca56c9b56
2017-06-09 20:14:27 +00:00
Adam Seaton
d6e984f9e3 Updating security string to 2017-08-05 2017-06-09 10:50:47 -07:00
Colin Cross
b22b57218b Unspecialize oc-dev-plus-aosp
oc-dev-plus-aosp will become aosp master, which needs to continue to
be able to build features targeted at PPR1.

This reverts commit 096aaeee16.

Bug: 36891159
Test: builds
Change-Id: I7060a5742609e96102027eea528e0e2db8e7b129
Merged-In: I546d1c25a2b1d948a0e7da796f59e734a98635da
2017-06-07 10:35:29 -07:00
Ian Pedowitz
611c95a3f8 resolve merge conflicts of be9844a03c to oc-dev-plus-aosp
Change-Id: If7d78718d8f6349b9b386c30096bd83d8f94cbc9
2017-05-15 21:01:59 -07:00
Ian Pedowitz
e44086e272 Merge "Revert "Revert "O is API 26.""" into oc-dev
am: e46cc54ab1

Change-Id: Ie5bcfa449bfbad2ef0800f86a989db92d2c19087
2017-05-16 03:50:10 +00:00
Ian Pedowitz
ae1f3abef4 O is 8.0.0 and REL
Bug: 38131332
Test: compiles
Change-Id: I0ccda8ab4f6edf056fd37bd8ee50555d01d3529e
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
2017-05-10 21:44:58 -07:00
Ian Pedowitz
9c350d7ef7 Revert "Revert "O is API 26.""
This reverts commit 75feb8927a.

Bug: 37480230
Bug: 37355569
Change-Id: I348413878e97f766863086d74bdc454f61b100ec
2017-05-10 08:58:53 -07:00
Ian Pedowitz
f94c2ef58b Merge "Revert "O is API 26."" into oc-dev
am: 6f93dd52b2

Change-Id: I0a1678c8f4060df7fe07c57f062bc446cdeebdcf
2017-05-04 00:16:51 +00:00
Ian Pedowitz
75feb8927a Revert "O is API 26."
This reverts commit 06fc7e023b.

Reason for revert:  b/37355569

Bug: 37480230
Bug: 37355569
Change-Id: I2eef4fb5369fa4e9d7a410461de63d4dd43dfc09
2017-05-03 22:00:47 +00:00
Colin Cross
49718f9b85 Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested" am: 4a3dc1458f am: 624932e360
am: 6969203720

Change-Id: I84652622424ec1abe317b847d5fe00962aeb5853
2017-05-03 04:49:16 +00:00
Colin Cross
6969203720 Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested" am: 4a3dc1458f
am: 624932e360

Change-Id: I45f7279ee6a216fec15fcd2dd2337126d78bb684
2017-05-03 04:46:19 +00:00
Colin Cross
1c1e142199 Only set TARGET_PLATFORM version in lunch when explicitly requested
Setting TARGET_PLATFORM_VERSION to DEFAULT_PLATFORM_VERSION during
"lunch sailfish-userdebug" causes unnecessary pain when
DEFAULT_PLATFORM_VERSION becomes invalid after branching.  Only
set TARGET_PLATFORM_VERSION if it was explicitly requested with
lunch sailfish-userdebug-OPR1.

Test: build/make/tests/envsetup_tests.sh
Bug: 34972208
Bug: 37208937
Change-Id: I40ba4617e73803c5bec1a8d317382f70fb3ec3a2
Merged-In: I40ba4617e73803c5bec1a8d317382f70fb3ec3a2
2017-05-03 02:47:59 +00:00
Michael Wright
81cd9227f3 O is API 26.
am: 06fc7e023b

Change-Id: I941174825498f5e0f517b6aa3634231a5af4c8ec
2017-05-02 22:17:32 +00:00
Michael Wright
06fc7e023b O is API 26.
Bug: 37480230
Test: Build, run.
Change-Id: I2f0e7fecf38d224c20d18cff856c45a7a3e624ad
2017-05-02 18:31:53 +01:00
Adam Seaton
055547cddf [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0 am: 0e503efe43
am: 019c695262

Change-Id: I37a3b1cb0c40b7190bcdc3f88e2fe513346c8baa
2017-04-12 23:07:52 +00:00
Adam Seaton
91785ec139 [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986 am: 888cf4cf67
am: 17a45d4c94

Change-Id: Iccb34b97bfc970f6188860cd53bb4005029dc758
2017-04-12 23:07:46 +00:00
Adam Seaton
019c695262 [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0
am: 0e503efe43

Change-Id: Ib1b56bf6343908c99bec636b7c0662eede3a9284
2017-04-12 23:02:50 +00:00
Adam Seaton
17a45d4c94 [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986
am: 888cf4cf67

Change-Id: Ia4ff300b605e9ce6e93d8983e4d728d42516fa5b
2017-04-12 23:02:45 +00:00
Adam Seaton
49ca7ee1b0 [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f
am: 15420e5bb0

Change-Id: Ia48ded0030f51f9f5381e1b84cb1d5a28d7bae42
2017-04-12 22:52:19 +00:00
Adam Seaton
c347cb4986 [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599
am: 518f3b9283

Change-Id: Idcf446c209e4ef340d48942d63c5cabcc5d5bec6
2017-04-12 22:52:14 +00:00
Adam Seaton
15420e5bb0 [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
am: 70d708e29f

Change-Id: Iee4027fe4abe311f44582b430786ff3011d93476
2017-04-12 22:47:17 +00:00
Adam Seaton
518f3b9283 [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
am: d9a5e99599

Change-Id: I732c1fdf51b33a7588bdec0f5d86bb6a6210b334
2017-04-12 22:47:13 +00:00
Adam Seaton
70d708e29f [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
bug:37204197
Change-Id: I9790487cd9bf8fb8e44856216407b35d067a9d16
2017-04-12 21:26:52 +00:00
Adam Seaton
d9a5e99599 [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
bug:37204197
Change-Id: I81ae6196028c983baf82800a364805025672bec9
2017-04-11 18:20:36 +00:00
Colin Cross
0b1de05d3c Merge "Specialize oc-dev into OPR1" into oc-dev
am: b70a93465a

Change-Id: I488e308e863e7ea8ddbfe6f4d1a0588ebec016d5
2017-04-08 02:13:51 +00:00
Colin Cross
096aaeee16 Specialize oc-dev into OPR1
Only allow building OPR1 in oc-dev.

Bug: 36891159
Change-Id: Ib778ad5232a8e33e312d467f6f6970a8027c81c1
Merged-In: I546d1c25a2b1d948a0e7da796f59e734a98635da
Test: treehugger
2017-04-04 12:38:55 -07:00
Colin Cross
f658305484 Add min and max supported versions
Add MIN_PLATFORM_VERSION and MAX_PLATFORM_VERSION to track
the range of releases that are expected to be released from
the current branch.

Also simplify version_defaults.mk by moving most of the code
to envsetup.mk.

Test: build/make/tests/envsetup_tests.sh
Change-Id: I4f19c31c267e202f8f5ba1384a8b4385d725f9d7
(cherry picked from commit c901659377)
2017-03-31 18:39:12 -07:00
Dan Albert
9a9e7dd8a2 Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." am: 979dac690a am: e2b92d809f
am: 6861a292a0

Change-Id: I1d91765933fa76d8a83ab6932563c637f0c34163
2017-03-31 23:14:42 +00:00
Dan Albert
6861a292a0 Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." am: 979dac690a
am: e2b92d809f

Change-Id: I9cb0b52b1121146aa75ffff31e63ae5118ad9510
2017-03-31 23:12:11 +00:00
Dan Albert
e2b92d809f Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES."
am: 979dac690a

Change-Id: Ib4aa98fe335d90f1407ccb27fa4c57d5d30cbbf5
2017-03-31 23:09:42 +00:00
Dan Albert
839db81b26 Auto-generate PLATFORM_VERSION_ALL_CODENAMES.
Test: Temporarily added additional codenames for OPD1 -> O and
      OPM1 -> O-MR1. Lunched aosp_sailfish-eng, built build.prop and
      checked that ro.build.version.all_codenames was "O". Then
      lunched aosp_sailfish-eng-PPR1 and checked that it was
      "O,O-MR1,P".
Bug: None

Change-Id: I51189f5b40e3e7f99e2fc08bb5616c51a23e3b19
2017-03-31 10:59:02 -07:00
Colin Cross
99a995157b Merge "Add min and max supported versions" am: ae4779e254 am: e611741d85
am: 4859177dd9

Change-Id: I8d5501607db18382dec51a7cfa490536a0218406
2017-03-29 00:53:26 +00:00
Colin Cross
4859177dd9 Merge "Add min and max supported versions" am: ae4779e254
am: e611741d85

Change-Id: I392213b405efb58d8aa3fb3b2151280d4426d380
2017-03-29 00:51:21 +00:00
Colin Cross
e611741d85 Merge "Add min and max supported versions"
am: ae4779e254

Change-Id: Ic6d0fb99e95d55253be00f7b191d3287a207c2c8
2017-03-29 00:49:20 +00:00
Colin Cross
c901659377 Add min and max supported versions
Add MIN_PLATFORM_VERSION and MAX_PLATFORM_VERSION to track
the range of releases that are expected to be released from
the current branch.

Also simplify version_defaults.mk by moving most of the code
to envsetup.mk.

Test: build/make/tests/envsetup_tests.sh
Change-Id: I4f19c31c267e202f8f5ba1384a8b4385d725f9d7
2017-03-28 13:32:04 -07:00
Colin Cross
1b81278572 Merge "Add TARGET_PLATFORM_VERSION to lunch" am: a007142381 am: 7b5dc8ad3e
am: 086d109f35

Change-Id: If005f3917b1f1664b111ce7d070590a47a259ce5
2017-03-24 00:27:16 +00:00
Colin Cross
086d109f35 Merge "Add TARGET_PLATFORM_VERSION to lunch" am: a007142381
am: 7b5dc8ad3e

Change-Id: If12b3c0f688a8d4a42f188b98a1f18b86da57d13
2017-03-24 00:25:45 +00:00
Colin Cross
7b5dc8ad3e Merge "Add TARGET_PLATFORM_VERSION to lunch"
am: a007142381

Change-Id: Ic9b38a74041f839300f82a4ecfb724079b62a900
2017-03-24 00:24:16 +00:00
Colin Cross
8873713f36 Add TARGET_PLATFORM_VERSION to lunch
lunch can now take combos in the form:
$TARGET_PRODUCT
$TARGET_PRODUCT-$TARGET_BUILD_VARIANT
$TARGET_PRODUCT-$TARGET_BUILD_VARIANT-$TARGET_PLATFORM_VERSION

If all 3 are not specified the unspecified ones will take the
default values provided by the build system (eng, and currently
OPR1).

In addition, error handling for invalid products, variants and
versions is moved to the build system.

Bug: 34972208
Test: build/make/tests/envsetup_tests.sh
Change-Id: Ib0aaa98633448ba9bd8df911704c9cb3a8ebbe85
2017-03-23 09:44:08 -07:00
Ian Pedowitz
662f11905d PLATFORM_PREVIEW_SDK_VERSION should be 2 for the next Preview/Beta Release of OC
Test: lunch marlin-userdebug && m -j40
Change-Id: I1654ab2b63ebddc79fd41f3c9d3d9e3902f03172
Fixes: 36512249
2017-03-22 11:02:39 -07:00
Colin Cross
f35c03a6a5 Set PLATFORM_VERSION for PPR1 builds to P
Fixes error about missing PPR1.adb_key file.

Bug: 34972208
Test: lunch sailfish-userdebug-PPR1 && m -j
Change-Id: I82cd78376f3e238a6c4aaf27825c8d66b89d5a89
2017-03-21 23:10:44 -07:00
Colin Cross
7ad4cdd91f Use new naming scheme for TARGET_PLATFORM_VERSION
am: f6cf099b27

Change-Id: I8a43ab65525c72978dcfe8aee25f1022776af6a4
2017-03-22 02:24:51 +00:00
Colin Cross
f6cf099b27 Use new naming scheme for TARGET_PLATFORM_VERSION
Replace the current naming scheme for TARGET_PLATFORM_VERSION
(O, ODR1, OMR1, P) with one that matches the user-visible
branch version (OPR1, OPD1, OPM1, PPR1).

Temporarily map P -> PPR1 to decouple this change from updating
the build servers.

Bug: 34972208
Test: m -j TARGET_PLATFORM_VERSION=PPR1
Test: m -j TARGET_PLATFORM_VERSION=P
Change-Id: Ib00b13abe79a744e344b88bb1d800524ab09d585
(cherry picked from commit d8bc190a63)
2017-03-22 01:48:03 +00:00
Colin Cross
9efe51f27a Use new naming scheme for TARGET_PLATFORM_VERSION
Replace the current naming scheme for TARGET_PLATFORM_VERSION
(O, ODR1, OMR1, P) with one that matches the user-visible
branch version (OPR1, OPD1, OPM1, PPR1).

Temporarily map P -> PPR1 to decouple this change from updating
the build servers.

Bug: 34972208
Test: m -j TARGET_PLATFORM_VERSION=PPR1
Test: m -j TARGET_PLATFORM_VERSION=P
Change-Id: Ib00b13abe79a744e344b88bb1d800524ab09d585
Merged-In: Ib00b13abe79a744e344b88bb1d800524ab09d585
2017-03-21 23:38:02 +00:00