Adam Seaton
1b17813951
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
...
am: ca22b203d0
2017-08-22 22:41:59 +00:00
Adam Seaton
2174b6e355
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
...
am: 55b78726b4
2017-08-22 22:41:28 +00:00
Adam Seaton
ca22b203d0
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
...
am: ce4bc47c74
2017-08-22 22:37:09 +00:00
Adam Seaton
55b78726b4
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
...
am: fce94e0000
2017-08-22 22:36:22 +00:00
Adam Seaton
4e140ce86a
Update platform security string to 2017-10-05 in oc-dev Bug:64896113
2017-08-21 11:37:32 -07:00
Adam Seaton
80d3742026
Update platform security string to 2017-10-01 in oc-dev Bug:64896113
2017-08-21 11:36:54 -07:00
Dan Albert
3626b53135
Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f am: 5ebfa32c53
...
am: 373d682c69
2017-08-03 02:37:40 +00:00
Dan Albert
373d682c69
Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f
...
am: 5ebfa32c53
2017-08-03 02:32:40 +00:00
Dan Albert
5ebfa32c53
Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES."
...
am: 577ff4730f
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
eba39713c8
Merge changes I863200b2,Ifdd9663b am: 770a498e99 am: 10e9d25035
...
am: 1761a50f5f
2017-07-26 21:53:59 +00:00
Dan Willemsen
1761a50f5f
Merge changes I863200b2,Ifdd9663b am: 770a498e99
...
am: 10e9d25035
2017-07-26 21:49:36 +00:00
Dan Willemsen
10e9d25035
Merge changes I863200b2,Ifdd9663b
...
am: 770a498e99
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
Adam Seaton
41020cce0f
Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812
...
am: de8af68e73
2017-07-20 21:04:14 +00:00
Adam Seaton
de8af68e73
Merge changes I7c8a25a2,Ifb32d061 into oc-dev
...
am: 683c44c812
2017-07-20 20:57:46 +00:00
Adam Seaton
32f388f655
Updating Security String to 2017-09-05 Bug:63846344
2017-07-19 10:42:03 -07:00
Adam Seaton
f1c17f17ff
Updating Security String to 2017-09-01 Bug:63846344
2017-07-19 10:41:05 -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
42ff695568
Updating security string to 2017-08-05 am: d6e984f9e3
...
am: d2d14aa0ea
2017-06-09 20:16:56 +00:00
Adam Seaton
d2d14aa0ea
Updating security string to 2017-08-05
...
am: d6e984f9e3
2017-06-09 20:14:29 +00:00
Adam Seaton
c5c1af423a
Updating security string to 2017-08-05
...
am: d6e984f9e3
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
2017-06-07 10:35:29 -07:00
Baligh Uddin
910e08c023
DO NOT MERGE ANYWHERE - Set MAX_PLATFORM_VERSION to OPD1 on oc-dr1-dev
...
Bug: 38436796
2017-06-07 10:19:42 -07:00
Ian Pedowitz
71b832169f
Revert "Revert "OC-DR is 8.0.1""
...
This reverts commit 780cd459dc
2017-06-06 15:47:48 +00:00
Thierry Strudel
780cd459dc
Revert "OC-DR is 8.0.1"
...
This reverts commit 43b2829780
2017-05-31 16:20:58 +00:00
Ian Pedowitz
43b2829780
OC-DR is 8.0.1
...
Bug: 38502482
Test: source build/envsetup.sh && lunch marlin-userdebug && m -j40
Change-Id: Ic358ea8b6c23b83cfdd652b88ed5746a578c9edd
2017-05-22 20:54:33 +00:00
Ian Pedowitz
bf1d094db8
Since OC-DR is also API26, it should be REL
...
Since OC is API26/REL now.
Bug: 38502482
Test: source build/envsetup.sh && lunch marlin-userdebug && m -j40
Change-Id: I4b44160cc4845975d8e6b0c2cfcb2dec69434716
2017-05-22 20:47:39 +00:00
Ian Pedowitz
4b2b2a7bdc
Removing OPR1 from master as OC is API26
...
Bug: 38131332
Test: Compiles
Change-Id: I138bd0eae376b147192584a94d4f4ea67b1e99cb
2017-05-16 14:37:01 -07:00
Ian Pedowitz
8a180a8540
Merge "Revert "Revert "O is API 26.""" into oc-dev am: e46cc54ab1
...
am: e44086e272
2017-05-16 04:47:31 +00: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
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
2017-05-10 08:58:53 -07:00
Ian Pedowitz
f94c2ef58b
Merge "Revert "O is API 26."" into oc-dev
...
am: 6f93dd52b2
2017-05-04 00:16:51 +00:00
Ian Pedowitz
75feb8927a
Revert "O is API 26."
...
This reverts commit 06fc7e023b
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
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
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
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
Ian Pedowitz
0a06d8ba79
Revert "Revert "master is now OPD1/ODR by default and adding OPM1/OMR1""
...
This reverts commit d9c3fd1d55
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
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
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
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
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
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
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
2017-04-12 22:52:14 +00:00
