Commit graph

632 commits

Author SHA1 Message Date
Narayan Kamath
fb850dc67e Merge "Provisionally increase PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION to 23."
am: 0e0ef050f9

Change-Id: I3c909ca434a86ead2a7660f440b585cba50dfd95
2018-09-03 07:28:17 -07:00
Narayan Kamath
ea9fe4787a Merge "Fix misleading comment in version_defaults.mk"
am: 3536f6abe4

Change-Id: Ia9edcffc2b919cae82c0ddbb2130413fa5e63178
2018-08-31 13:05:46 -07:00
Narayan Kamath
e4f41463fd Provisionally increase PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION to 23.
Bug: 112828438
Test: m
Change-Id: Id66e19cab1248ce7c89a39e3bd21b7e0dae8c4e7
2018-08-24 16:08:41 +01:00
Narayan Kamath
e7d93422d1 Fix misleading comment in version_defaults.mk
Test: m
Bug: 111003817
Change-Id: Iaf185a2cce0c53b0c3dc52bce2d03ea6df0ca681
2018-08-24 15:17:33 +01:00
Adam Seaton
e3cb7c3a73 Updating Platform Security String to 2018-09-05 Bug: 111501777 am: 6bc223c9af
am: 57c2d9f670

Change-Id: I8ed61f72717a185b342a5a728e8111ad6dd606df
2018-07-16 14:27:08 -07:00
Adam Seaton
57c2d9f670 Updating Platform Security String to 2018-09-05 Bug: 111501777
am: 6bc223c9af

Change-Id: I588810a6254c3c14d9e4398a3be05987308e12af
2018-07-16 14:22:57 -07:00
Adam Seaton
6bc223c9af Updating Platform Security String to 2018-09-05
Bug: 111501777
2018-07-16 10:17:21 -07:00
Adam Seaton
f6bee62b8e [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August
Bug:109889880
2018-06-18 17:28:17 +00:00
Adam Seaton
ec658daa02 Update Platform security string to 08-05 for August release bug: 109889880
am: f20c71f190

Change-Id: I08103150da5c1afe2355a4869fe51ca0dcfc3927
2018-06-07 17:08:09 -07:00
Adam Seaton
f20c71f190 Update Platform security string to 08-05 for August release
bug: 109889880
2018-06-07 14:52:58 -07:00
Adam Seaton
ed429ca545 Merge "DO NOT MERGE Update Platform Security String to 2018-07-05 for pi-dev bug: 79883349" into pi-dev
am: 889775dff3

Change-Id: Id410f49480abce946ce82855121539ff201bce09
2018-06-04 12:51:27 -07:00
Adam Seaton
9b8b5854e8 DO NOT MERGE Update Platform Security String to 2018-07-05 for pi-dev
bug: 79883349
2018-06-01 23:03:44 +00:00
Adam Seaton
cfbe84b8a0 DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev
Bug:79883349
2018-06-01 23:00:36 +00:00
Tao Bao
48bbb1ba67 Expose PLATFORM_SECURITY_PATCH_TIMESTAMP.
We have use case that uses the timestamp for PLATFORM_SECURITY_PATCH in
device specific Makefile, but need to handle the platform-dependent
`date` command. This CL computes and exposes
PLATFORM_SECURITY_PATCH_TIMESTAMP from the core build system.

Bug: 80311893
Test: Use PLATFORM_SECURITY_PATCH_TIMESTAMP in device-specific folder,
      on both of Linux and macOS. Check the value.
Change-Id: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
Merged-In: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
(cherry picked from commit 717d9d3ae2)
2018-05-29 15:34:08 -07:00
Tao Bao
d4328a80b8 Merge "Expose PLATFORM_SECURITY_PATCH_TIMESTAMP." am: d48f2a1408
am: cec4c5dfc5

Change-Id: Ib40d8c0fa4a289cf2029b477b9a9469550bd5ae7
2018-05-29 14:20:57 -07:00
Tao Bao
717d9d3ae2 Expose PLATFORM_SECURITY_PATCH_TIMESTAMP.
We have use case that uses the timestamp for PLATFORM_SECURITY_PATCH in
device specific Makefile, but need to handle the platform-dependent
`date` command. This CL computes and exposes
PLATFORM_SECURITY_PATCH_TIMESTAMP from the core build system.

Bug: 80311893
Test: Use PLATFORM_SECURITY_PATCH_TIMESTAMP in device-specific folder,
      on both of Linux and macOS. Check the value.
Change-Id: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
2018-05-29 11:45:09 -07:00
Adam Seaton
7a95f884cc Merge "DO NOT MERGE: Updating security string for pi-dev to 2018-06-05" into pi-dev
am: 7bc3e17c05

Change-Id: I40ee666e90f8bac02df5d2679fd76c5a66cc86ff
2018-05-16 14:03:44 -07:00
Adam Seaton
7bc3e17c05 Merge "DO NOT MERGE: Updating security string for pi-dev to 2018-06-05" into pi-dev 2018-05-16 20:54:29 +00:00
android-build-team Robot
1680c0af1d Merge "PLATFORM_PREVIEW_SDK_VERSION should be 0" into pi-dev
am: 9665c10777

Change-Id: I007049bc00bead700734b90ae831fb2b7aa728cc
2018-05-03 17:31:29 -07:00
Ian Pedowitz
23898eed9d PLATFORM_PREVIEW_SDK_VERSION should be 0
It is already set to 0 because of REL, but explicitly set it

Bug: 77589980
Test: N/A
Change-Id: I97839c7dc09f8313f767635469f27b2a0d0e5010
2018-05-03 15:27:27 -07:00
Ian Pedowitz
8eb8ec88f5 Adding Q entries to version_defaults.mk
Bug: 77589980
Test: Build
Change-Id: Ic96cfae559143bd0d985663cbe58e09619978c97
Merged-In: Ic83304d326121326f380afca8fdf466ecc0781b0
Merged-In: I1ccbfdeddb2eecb6342253e401bba118c3652f8d
2018-05-02 13:51:24 +00:00
Ian Pedowitz
ec7605680a Adding Q entries to version_defaults.mk
Removing PPR1 entries from version_defaults.mk

Bug: 77589980
Test: Build
Change-Id: Ic83304d326121326f380afca8fdf466ecc0781b0
Merged-In: I1ccbfdeddb2eecb6342253e401bba118c3652f8d
2018-05-01 15:19:35 -07:00
Ian Pedowitz
2f33436f15 Revert "DO NOT MERGE: P is now REL"
This reverts commit 2325d05510.

Reason for revert: Broke -plus-aosp builds.  Reverting there to fix.

Change-Id: I625092da1df78ac76590ab27b01ed6f506e5e237
2018-05-01 02:46:16 +00:00
Ian Pedowitz
6f1bf853cd Merge "DO NOT MERGE: P is now REL" into pi-dev
am: 9ab9fe762d

Change-Id: I89f09feebd92c79df725d2816d4831dd7af75457
2018-04-30 18:21:39 -07:00
Ian Pedowitz
9ab9fe762d Merge "DO NOT MERGE: P is now REL" into pi-dev 2018-05-01 01:07:50 +00:00
Jiyong Park
fdd8f3c8ac Removed obsolete comment on PLATFORM_SYSTEMSDK_MIN_VERSION
am: 43c6a65706

Change-Id: Ic213ff189112028e93c63fa2577711eaca044bed
2018-04-27 00:11:59 -07:00
Jiyong Park
43c6a65706 Removed obsolete comment on PLATFORM_SYSTEMSDK_MIN_VERSION
The min version has been set.

Bug: 78023556
Test: no need
Change-Id: I12f816dfb9be7e9e945a68540f4efcfcc32b7cc2
2018-04-27 14:26:53 +09:00
Colin Cross
e1c494b3aa Merge "Set PLATFORM_SYSTEMSDK_MIN_VERSION := 28" into pi-dev
am: 026ac8f240

Change-Id: Iafb7acc932ff80924611df64f61acf5845662708
2018-04-26 15:16:34 -07:00
Colin Cross
88f3946e0e Set PLATFORM_SYSTEMSDK_MIN_VERSION := 28
In the temporary P-Finalization state, where PLATFORM_SDK_VERSION has
been incremented to 28 but PLATFORM_VERSION_CODENAME.PPR1 := P instead
of REL, PLATFORM_SYSTEMSDK_VERSIONS is still only P.  Set
PLATFORM_SYSTEMSDK_MIN_VERSION := 28 so that PLATFORM_SYSTEMSDK_VERSIONS
is 28 P.  Once PLATFORM_VERSION_CODENAME.PPR1 := REL it will become
just 28.

Bug: 78023556
Test: print PLATFORM_SYSTEMSDK_VERSIONS
Change-Id: I72cbef7bb7c84e6fd6fe4602021bb72d759d1b5e
2018-04-26 11:44:38 -07:00
Adam Seaton
85a18252b7 DO NOT MERGE: Updating security string for oc-mr1-dev to 2018-06-05
Bug:78240102
Change-Id: Ib9d8c11ecf9212711a9679972c15354c8dd56857
2018-04-18 21:25:50 +00:00
Adam Seaton
f051d6def2 DO NOT MERGE: Updating security string for pi-dev to 2018-06-05
Bug:78240102
Change-Id: I3956e7b1b2e7035fa36b3ca74eccd0d4fffeee95
2018-04-18 21:25:31 +00:00
Adam Seaton
1c533135e3 Merge "Update security string to 2018-05-05 on pi-dev Bug: 74345861" into pi-dev
am: 62e48ce1a4

Change-Id: I47189cbdecc76011436194d17c5d731d8f1358a3
2018-04-17 13:48:55 -07:00
TreeHugger Robot
62e48ce1a4 Merge "Update security string to 2018-05-05 on pi-dev Bug: 74345861" into pi-dev 2018-04-17 20:09:20 +00:00
Dan Willemsen
1f1e2e4eea Mark version_defaults as readonly
These shouldn't be changed by anyone after this point, and this will
prevent random Android.mk from re-including this file.

Test: m nothing
Test: failed on hikey w/o https://android-review.googlesource.com/662764
Change-Id: I7ba4db3594af5b18b98fafee81b64531a40df396
Merged-In: I7ba4db3594af5b18b98fafee81b64531a40df396
2018-04-17 01:30:08 +00:00
Dan Chapin
2325d05510 DO NOT MERGE: P is now REL
Bug: 77589980
Test: Build
Change-Id: I27bf5cc01133ff8734ed959825b9ffaba3532449
2018-04-13 15:23:54 -07:00
TreeHugger Robot
18fbe81b9f Merge "Mark version_defaults as readonly" into pi-dev-plus-aosp 2018-04-13 21:39:43 +00:00
Wale Ogunwale
07a54b7fba Finalizing P SDK
Bug: 77588754
Test: builds
Merged-In: Iebb43a246016774150a3053f10bdedb0278b3e5d
Change-Id: Ied2e381795643aaf8c48e6c89d8ee66b8b5b15ed
2018-04-13 14:59:03 +00:00
Dan Willemsen
693c7fb31b Mark version_defaults as readonly
These shouldn't be changed by anyone after this point, and this will
prevent random Android.mk from re-including this file.

Test: m nothing
Test: failed on hikey w/o https://android-review.googlesource.com/662764
Change-Id: I7ba4db3594af5b18b98fafee81b64531a40df396
2018-04-12 23:37:46 +00:00
Adam Seaton
8108edbc87 Update security string to 2018-05-05 on pi-dev
Bug: 74345861
2018-04-12 11:56:29 -07:00
Ian Pedowitz
191badd71b Bump PLATFORM_PREVIEW_SDK_VERSION to 2 for P-Beta1
Change-Id: Ic4e94c90fb1f86283858a88777a92ae75d6b65ed
Fixes: 77801171
Test: N/A
2018-04-09 09:36:58 -07:00
Adam Seaton
cd85c0da4a DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05
Bug: 74345861
Change-Id: I85a9878bfd441bc95242023f713b6848992bea06
2018-03-13 13:04:40 -07:00
Nan Zhang
972bd248f9 Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd am: 90b8d087e6
am: 7e634580ba

Change-Id: I514525914843c2cad6591ed6f515aed3aecc286a
2018-02-22 02:36:22 +00:00
Nan Zhang
7e634580ba Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd
am: 90b8d087e6

Change-Id: I7360282931fa4646e733f7326aea5a2a3cea1a97
2018-02-22 02:29:18 +00:00
Nan Zhang
0abdb5811d Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.
<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.

Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
2018-02-21 14:12:18 -08:00
Colin Cross
b351b6ebde Merge "Partially revert BUILD_DATETIME change" am: f5a87046c5 am: 0d68c850f7
am: 4b03c695d6

Change-Id: Ife94343139c513f5e80c87d8dbcd88587f99f2e3
2018-02-16 20:25:09 +00:00
Colin Cross
4b03c695d6 Merge "Partially revert BUILD_DATETIME change" am: f5a87046c5
am: 0d68c850f7

Change-Id: I2792a15a40f3d51a3d6a5a446e45071dd0970e9a
2018-02-16 20:17:07 +00:00
Colin Cross
ce8c05196d Partially revert BUILD_DATETIME change
Change Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901 caused kati to
regenerate on every build:
$(shell cat out/build_date.txt) was changed, regenerating...
Switch back to $(shell date +%s) which is special cased in kati
to not cause a regeneration.  Everything besides DATE will still
use BUILD_DATETIME_FROM_FILE from soong_ui.

Once BUILD_NUMBER is moved to soong_ui $(DATE) is no longer
necessary and the whole thing can be removed.

Bug: 70351683
Bug: 73352417
Test: m && m doesn't regenerate
Test: m BUILD_DATETIME=1234 shows up in ro.build.version.incremental
Change-Id: I8444beb2b47a49095ef760083fc85f220821bffe
2018-02-16 09:41:24 -08:00
Nan Zhang
f1cbc5dbf1 Merge "Remove BUILD_DATETIME from Make." am: 4babe39d0f am: 03bca8c4a8
am: 649f5b3c9a

Change-Id: Iaf6c6240dce29da37b2b4dd30abbc7326a5464be
2018-02-15 22:59:46 +00:00
Nan Zhang
649f5b3c9a Merge "Remove BUILD_DATETIME from Make." am: 4babe39d0f
am: 03bca8c4a8

Change-Id: I3f8e13a53dbd3217f3ae15b9512d3bb917695df1
2018-02-15 22:53:02 +00:00
Nan Zhang
975f41ed34 Remove BUILD_DATETIME from Make.
Soong_UI will handle build timestamp and export date file to Make.

Test: m -j32
Bug: b/70351683
Change-Id: Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901
2018-02-14 13:30:53 -08:00