Commit Graph

341 Commits

Author SHA1 Message Date
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
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 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 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
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
Colin Cross 2afade582d resolve merge conflicts of da00e137ec to stage-aosp-master
Change-Id: Ie81c0f4f5f14ae3e51ee717a50d0c29b26161b90
2017-03-15 10:20:24 -07:00
Colin Cross b3bfc7172b Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME
Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME from
TARGET_PLATFORM_VERSION.  Add explicit values for O, even though
they are the same as the fall backs, as placeholders for future
values.

Bug: 35445510
Test: manual
Merged-In: I30a7142f732c85b637d2ce072373bc867cedcd42
Change-Id: I30a7142f732c85b637d2ce072373bc867cedcd42
2017-03-15 01:10:28 +00:00
Colin Cross f78a2f821c Merge "Use ifndef or ifeq () instead of ifeq """
am: 1948f64dd5

Change-Id: I0a582b85ae540f9b164c93cf5363049258983a64
2017-02-22 04:30:00 +00:00
Colin Cross 63fe36abbe Use ifndef or ifeq () instead of ifeq ""
ifeq with quotes is technically correct make syntax, but rarely used.
Replace it with the simpler ifndef when comparing against empty, or
with parenthesis for consistency.

Test: builds
Change-Id: Idcbe0586c4626c67d560694596b0bd9f5f93484a
2017-02-21 17:29:10 -08:00
Colin Cross 653470d457 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b am: 4cfa9fcd48
am: 5122f6fd67

Change-Id: I7e13cea1775538c07e952c5770002777eca010bf
2017-02-17 03:50:39 +00:00
Colin Cross 5122f6fd67 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b
am: 4cfa9fcd48

Change-Id: I9fc141840a2b186b252bd2764344a9e791690ef6
2017-02-17 03:46:08 +00:00
Colin Cross d3183bdf40 Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION
Create a default list of minor versions (v, vDR1, vDR2, vMR1, vMR2)
for O and P, and propagate TARGET_PLATFORM_VERSION to IS_AT_LEAST_*
variables.

Test: manual
Bug: 34610721
Change-Id: I575caa099d85ee6fbc79538e67dc8d621e81790f
2017-02-16 17:08:03 -08:00
Adam Seaton c54e7f5658 Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92 am: af59a1c806
am: 61a00ef2ba

Change-Id: If80382b4934a1828fa4738a21a006012cfa3d7bf
2017-02-13 23:26:43 +00:00
Adam Seaton 8ddb562911 Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528 am: 03dc9a951a
am: 570e257352

Change-Id: I443c49a8d536c5bfa21f53cabb7687adc2778ef6
2017-02-13 23:26:37 +00:00
Adam Seaton 61a00ef2ba Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92
am: af59a1c806

Change-Id: Ibae45eca09589a4048389541c121c827b9292cd9
2017-02-13 23:24:44 +00:00
Adam Seaton 570e257352 Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528
am: 03dc9a951a

Change-Id: Ic810aa498e9ebf8cf8224c9abfbbc8e11de863a5
2017-02-13 23:24:37 +00:00
Adam Seaton 9cff197d92 Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1
am: e69e40cc34

Change-Id: I7a30fc2fe048aa1e6da8c7ea808961b5437e713d
2017-02-13 23:18:42 +00:00
Adam Seaton 4526457528 Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2
am: b1865c4cac

Change-Id: I20cd2ed43edee894f4e1e183628392b54c2c9478
2017-02-13 23:18:36 +00:00
Adam Seaton e69e40cc34 Update Security String to 2017-04-05 on nyc-dev
am: 8ee3a4cef1

Change-Id: I4f7853e8ce785d41b5f2cd4e67458707e100f056
2017-02-13 23:16:13 +00:00
Adam Seaton b1865c4cac Update Security String to 2017-04-01 on nyc-dev
am: 93c1a722c2

Change-Id: I76d811946e6f9c7bee897a8bd4e8c49e465dd0c1
2017-02-13 23:16:07 +00:00
Adam Seaton 8ee3a4cef1 Update Security String to 2017-04-05 on nyc-dev
Bug:35314737
2017-02-13 11:49:59 -08:00
Adam Seaton 93c1a722c2 Update Security String to 2017-04-01 on nyc-dev
Bug:35314737
2017-02-13 11:48:25 -08:00
Adam Seaton 59d758b7e3 Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91 am: 8e89e568b9 am: 8e90b1da24
am: 9dc5de2366

Change-Id: I59f695b65ec0b6b81e4fb5b4ce7494a120804c54
2017-01-17 23:21:16 +00:00
Adam Seaton 447da95e58 Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am: 54b11f5c49 am: 9bbbf746ec
am: b7cb7b4f50

Change-Id: If6458c264285531b087801014a1ca177a79ee0e0
2017-01-17 23:21:11 +00:00
Adam Seaton 72e3501bd4 Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91 am: 8e89e568b9
am: 8e90b1da24

Change-Id: Ie167252d0225afec37402e48f13ba039f76b9534
2017-01-17 23:18:46 +00:00
Adam Seaton 9dc5de2366 Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91 am: 8e89e568b9
am: 8e90b1da24

Change-Id: Ie7078f8b32a1709360eddc1177474c863fac0968
2017-01-17 23:18:45 +00:00
Adam Seaton 5ac65adf12 Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am: 54b11f5c49
am: 9bbbf746ec

Change-Id: I3e492558fd5271a1661ecac667971f790643b720
2017-01-17 23:18:41 +00:00
Adam Seaton b7cb7b4f50 Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am: 54b11f5c49
am: 9bbbf746ec

Change-Id: I192b050d434a8c9f7f1562648fcc809c35650ef2
2017-01-17 23:18:40 +00:00
Adam Seaton 8e89e568b9 Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba
am: cb8fef9d91

Change-Id: I57a8e17828c908dcdb588bb4df8e12eeeef45d27
2017-01-17 23:12:15 +00:00
Adam Seaton 54b11f5c49 Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03
am: cacce5db57

Change-Id: I090fcc6c3986a07e2a5c6cd49e82b42470ea8002
2017-01-17 23:12:10 +00:00
Adam Seaton cb8fef9d91 Updating Security String to 2017-03-05 on nyc-dev
am: 25b39b12ba

Change-Id: I85a8100d821ed89b5c0ee4c347bb09b822c15d8d
2017-01-17 23:10:15 +00:00
Adam Seaton cacce5db57 Updating Security String to 2017-03-01 on nyc-dev
am: 003e5aad03

Change-Id: I5a7cec00ddc99b9b8791e2e61d21d1936d3afc4c
2017-01-17 23:10:09 +00:00
Adam Seaton 25b39b12ba Updating Security String to 2017-03-05 on nyc-dev
b/34345751

Change-Id: Ieaaccd7b92c85bb3389fab5e03011892bf7fdcba
2017-01-17 11:37:18 -08:00
Adam Seaton 003e5aad03 Updating Security String to 2017-03-01 on nyc-dev
b/34345751

Change-Id: I55d9ba3f16264f9e4f9ad72e861527a3f8ae566c
2017-01-17 11:36:19 -08:00
Adam Seaton 9cab808930 Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e am: 89e9059995
am: 7b86c49b95

Change-Id: I26116859fa0c0f8b0e07222db491cb2eefd3dfa9
2016-12-14 00:46:49 +00:00
Adam Seaton 3692e73cd5 Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5 am: 548f3ec0d3
am: 2af57857b8

Change-Id: I82e29fb23b492962b56659ff2e292c71a6989b10
2016-12-14 00:46:44 +00:00
Adam Seaton 7b86c49b95 Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e
am: 89e9059995

Change-Id: Id11cb447d0331a8643793b932537cb7a154fffb9
2016-12-14 00:40:49 +00:00
Adam Seaton 94fbbd200e Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e
am: 89e9059995

Change-Id: Iee0a4138b5293e3c2ad6b6017548b029a99c88fd
2016-12-14 00:40:49 +00:00
Adam Seaton 2af57857b8 Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5
am: 548f3ec0d3

Change-Id: I4234646b649f205b257047550b280358ab8f7711
2016-12-14 00:40:43 +00:00
Adam Seaton 0dd5eff86c Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5
am: 548f3ec0d3

Change-Id: Idf5473287d764e87705930d0ad439f8b727780cf
2016-12-14 00:40:43 +00:00
Adam Seaton dec80c416e Update Security String to 2017-02-05 on nyc-dev am: af63566009
am: f6dbc77231

Change-Id: I299409eb4369fe127a93ab8392ec847cd4df7f1f
2016-12-14 00:27:48 +00:00
Adam Seaton 2cc397f4c5 Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0
am: eaf4508b09

Change-Id: Iba9c094d3f0b5cc1a234ee43cc96947226f9d219
2016-12-14 00:27:43 +00:00
Adam Seaton f6dbc77231 Update Security String to 2017-02-05 on nyc-dev
am: af63566009

Change-Id: If672e58e906d16e1c863c54fc8b16903ce8df25a
2016-12-14 00:21:16 +00:00
Adam Seaton eaf4508b09 Update Security String to 2017-02-01 on nyc-dev
am: 35901a7fd0

Change-Id: I4cb3261d651f82ab13a5aad310562bfcc8f0e4d9
2016-12-14 00:21:12 +00:00
Adam Seaton af63566009 Update Security String to 2017-02-05 on nyc-dev
Change-Id: I761c90cd025b2862a3b6fe1cf12e6aebc5fa809f
2016-12-07 23:16:47 +00:00
Adam Seaton 35901a7fd0 Update Security String to 2017-02-01 on nyc-dev
Change-Id: I0e2dd0afcb6dd490dd81afb879890eeb41bf121d
2016-12-07 23:04:16 +00:00