Commit graph

420 commits

Author SHA1 Message Date
Ian Pedowitz
0a06d8ba79 Revert "Revert "master is now OPD1/ODR by default and adding OPM1/OMR1""
This reverts commit d9c3fd1d55.

Bug: 37201939
Fixes: 37212091
Change-Id: I7894321971c0b696594deb064ebed3f43cf7c8d1
2017-05-01 14:26:40 -07:00
Colin Cross
b105e365c7 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
2017-05-01 14:26:40 -07:00
Naveen Kalla
d9c3fd1d55 Revert "master is now OPD1/ODR by default and adding OPM1/OMR1"
This reverts commit 9af3fa123c.

Bug: 37201939
Test: Build, load and ensure that hidden menu can be launched
Change-Id: I1641cb528883f912a8051c7660e2750985bafae8
2017-04-10 11:48:29 -07:00
Ian Pedowitz
9af3fa123c master is now OPD1/ODR by default and adding OPM1/OMR1
Test: source build/envsetup.sh && lunch sailfish-userdebug && m -j40
Test: source build/envsetup.sh && lunch sailfish-userdebug-OPM1 && m -j40
Change-Id: I546d1c25a2b1d948a0e7da796f59e734a98635da
2017-04-03 12:27:05 -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
Colin Cross
d8bc190a63 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
2017-03-21 14:39:00 -07:00
Adam Seaton
f7e320b223 Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd am: f773f981bb am: b7baf15d67 am: 5ce9447af1
am: a75eb481bf

Change-Id: I1bc5a195daaff9997e1f58004b5eb6e4a55c4218
2017-03-16 16:53:36 +00:00
Adam Seaton
ca25ed58d2 Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42 am: 751d4cd04e am: e815842343 am: 4fae4a0fb1
am: 93887301f5

Change-Id: I5d339e57c396a90dfde446d7dc1a09c5c39b4e91
2017-03-16 16:53:15 +00:00
Adam Seaton
a75eb481bf Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd am: f773f981bb am: b7baf15d67
am: 5ce9447af1

Change-Id: Ic8318c3870b238a1a203f986afb9a1250215f03c
2017-03-16 16:50:28 +00:00
Adam Seaton
93887301f5 Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42 am: 751d4cd04e am: e815842343
am: 4fae4a0fb1

Change-Id: I738cca37b6f786d557879cbdef5ed2e9458c6023
2017-03-16 16:50:14 +00:00
Adam Seaton
5ce9447af1 Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd am: f773f981bb
am: b7baf15d67

Change-Id: Ice49d4fef55b52796517b88d8179266728bccf9a
2017-03-16 16:47:56 +00:00
Adam Seaton
4fae4a0fb1 Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42 am: 751d4cd04e
am: e815842343

Change-Id: I08540bc0374762443e18d25830534e4d5103ba1f
2017-03-16 16:47:44 +00:00
Adam Seaton
f773f981bb Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7
am: d5894faefd

Change-Id: Ibe7c5aa0d259e9cf2e7cbb9c4a5b5419e3eed283
2017-03-16 16:42:00 +00:00
Adam Seaton
751d4cd04e Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca
am: 368d0a8a42

Change-Id: I009a8d76a744afded3ef11b6c2485d5e7a9d9d31
2017-03-16 16:41:43 +00:00
Adam Seaton
d5894faefd Update Security String to 2017-05-05 on nyc-dev
am: cfdcc41cd7

Change-Id: I2e1144bca4f0429e06624eadc7a3ca5b83e299d0
2017-03-16 16:39:28 +00:00
Adam Seaton
368d0a8a42 Update Security String to 2017-05-01 on nyc-dev
am: 573e7e75ca

Change-Id: I04549e4c2926780d8e78edca3ca9f98615b00e97
2017-03-16 16:39:13 +00:00
Adam Seaton
cfdcc41cd7 Update Security String to 2017-05-05 on nyc-dev
Bug:34137924
2017-03-16 16:36:36 +00:00
Adam Seaton
573e7e75ca Update Security String to 2017-05-01 on nyc-dev
Bug:34137924
2017-03-16 16:31:51 +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
ca0afa36f3 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
Change-Id: I30a7142f732c85b637d2ce072373bc867cedcd42
2017-02-21 20:36:18 -08:00
Colin Cross
78cb9787b9 Merge "Use ifndef or ifeq () instead of ifeq """ am: 1948f64dd5 am: f78a2f821c
am: 901057d95a

Change-Id: I4f641ce791d64c7fe78e9938462820e7cd3be419
2017-02-22 04:36:00 +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
5cf5d36882 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b am: 4cfa9fcd48 am: 5122f6fd67
am: 653470d457

Change-Id: Id83ed8cdb26736fabc5084f56c8de9e4d797551d
2017-02-17 03:59:11 +00: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
38a84e5e83 Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92 am: af59a1c806 am: 61a00ef2ba
am: c54e7f5658

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

Change-Id: I79916ef63c71de877355c6268d8e90f8b222531d
2017-02-13 23:29:37 +00: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
a11bebd35b Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92
am: af59a1c806

Change-Id: I748fa6fff6aa89b847e1c2ac10d8f9384e08b2e2
2017-02-13 23:24:43 +00:00