StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,637 Commits 1 Branch 0 Tags
d29d4ea39cda2f5bc4bcaa8f1e8f7d0cb38dfe16
Commit Graph

921 Commits

Author SHA1 Message Date
Xin Li
849ad3ba72 Merge SQ1A.220205.002 
Bug: 213904741
Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
Change-Id: I880096a3272bb9ae5b95e7f9b507b464b5aec856
 2022-02-07 23:16:55 -08:00
Bill Yi
5a77fbf008 Merge sc-qpr1 to aosp-master - DO NOT MERGE 
Merged-In: I017a5d9c3cd227e0b1a4deaa8dface646bc0a887
Merged-In: I71f542d511cf6397d84d40b1fb688c307cdd386e
Change-Id: Id5d2b7b2b18ae1a1919a53121c06fb309e5b2eee
 2022-01-06 18:38:30 -08:00
Xin Li
90df2b43bc Merge SP1A.211205.008 
Bug: 205056467
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
Change-Id: Ic9d5fe40d265ef8002ccbcf3182a2fb8b6239135
 2021-12-20 14:07:52 -08:00
Bassem Khalife
d8c520303c [DO NOT MERGE] 
Update Security String to 2022-02-05
   
 Bug: 210005927

Change-Id: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
(cherry picked from commit fdbbcabca3)
Merged-In:Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
 2021-12-15 00:01:07 +00:00
Paul Scovanner
e04aaf2f4c [DO NOT MERGE] 
Update Security String to 2022-01-05

Bug: 207022948
Change-Id: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
(cherry picked from commit 9e20227ea5)
Merged-In:Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
 2021-11-24 23:20:37 +00:00
Paul Scovanner
0551d14073 [DO NOT MERGE] 
Update SPL to 2021-12-05

Bug: 202436544
Change-Id: Ib03873315839e4858f93d1ebbbc17054d46246c9
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
(cherry picked from commit 16eff988ab)
 2021-10-11 23:21:01 +00:00
Anton Hansson
311dfa0ef3 Merge "Update base sdk extension version to 1" into stage-aosp-master am: 200bada63c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15934175

Change-Id: Id1ccf89e6cd9e924f9d5c7ca53cdbcd9cd34018b
 2021-09-30 13:10:37 +00:00
Colin Cross
2b595c26d1 Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev 2021-09-29 16:59:52 +00:00
Anton Hansson
c9b330cacc Update base sdk extension version to 1 
S ships with extension version 1, so the correct base extension version
is 1 at the moment.

Bug: 199852423
Test: m out/host/linux-x86/development/sdk/platform_source.properties
      verify IsBaseSdk=true
Change-Id: I465d896fdeacfe34bdbfa0da1871d74a3bf3ee11
 2021-09-29 17:15:58 +01:00
Xin Li
68b4fefd60 Merge SP1A.210812.016 
Merged-In: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
Change-Id: I4777de3e09216497b88f6916f8a5997e4cd10743
 2021-09-28 19:25:30 +00:00
Colin Cross
177cbf600d Update build_id.mk and version_defaults.mk for SC QPR1 
Set BUILD_ID to "SC_QPR1", and update DEFAULT_PLATFORM_VERSION to
"SQ1A".

Bug: 201081191
Test: m checkbuild
Change-Id: I1ed59bef262be000bb8c77ed83bb549164a1c39b
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Merged-In: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
 2021-09-24 10:34:43 -07:00
Presubmit Automerger Backend
541828d6f0 [conflict] [DO NOT MERGE] 2p: 0449bb97fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927

Bug: 199784479
Change-Id: I4ee0a8240ace16d1a85b637b3d70568bae289693
 2021-09-16 13:20:30 +00:00
Paul Scovanner
0449bb97fa [DO NOT MERGE] 
Update Security String to 2021-11-05

Bug: 199784479
Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
 2021-09-16 11:39:07 +00:00
Sasha Smundak
cda1f3768f Move the stable code from version_defaults.mk to version_util.mk. 
With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.
This is a cherrypick of ag/15768054

Bug: 198995713
Test: treehugger
Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
 2021-09-15 16:12:05 -07:00
Sasha Smundak
1d7923e7d8 Move the stable code from version_defaults.mk to version_util.mk. 
With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.
This is a cherrypick of ag/15768054

Bug: 198995713
Test: treehugger
Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
 2021-09-14 08:53:10 -07:00
Anton Hansson
9b8082c2d4 Add new make variables for extension SDK version 
- PLATFORM_SDK_EXTENSION_VERSION is the sdk extension version of the
  tree
- PLATFORM_BASE_SDK_EXTENSION_VERSION is the sdk extension version that
  PLATFORM_SDK_VERSION ships with.

Also propagate PLATFORM_SDK_EXTENSION_VERSION to soong to that it can be
used in genrules.

Bug: 195281582
Test: via development/ CL in this topic
Change-Id: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
Merged-In: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
(cherry picked from commit ee524aa4f7bae2cc4d32eec3689aecf3e766dec4)
 2021-08-31 17:41:56 +00:00
Anton Hansson
2ea7e6ecad Add new make variables for extension SDK version 
- PLATFORM_SDK_EXTENSION_VERSION is the sdk extension version of the
  tree
- PLATFORM_BASE_SDK_EXTENSION_VERSION is the sdk extension version that
  PLATFORM_SDK_VERSION ships with.

Also propagate PLATFORM_SDK_EXTENSION_VERSION to soong to that it can be
used in genrules.

Bug: 195281582
Test: via development/ CL in this topic
Change-Id: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
(cherry picked from commit ee524aa4f7bae2cc4d32eec3689aecf3e766dec4)
 2021-08-27 17:42:15 +01:00
Paul Scovanner
3aa50b02bc Revert "Update Security String to 2021-10-06" 
This reverts commit 61275cd338.

Reason for revert: SPL bump no longer necessary due to ATT FRC respin

Bug: 193547118
Change-Id: I1df0e12d50471b518653ff865637193bd7ed9101
(cherry picked from commit 1f04c4d3e7)
 2021-08-26 01:11:18 +00:00
Presubmit Automerger Backend
7c0923f9ec [automerge] Revert "Update Security String to 2021-10-06" 2p: 1f04c4d3e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15678276

Bug: 193547118
Change-Id: Ie50456b3fc217af0b87677b5074c6225a407e808
 2021-08-26 01:04:25 +00:00
Paul Scovanner
1f04c4d3e7 Revert "Update Security String to 2021-10-06" 
This reverts commit 61275cd338.

Reason for revert: SPL bump no longer necessary due to ATT FRC respin

Bug: 193547118
Change-Id: I1df0e12d50471b518653ff865637193bd7ed9101
 2021-08-26 01:04:17 +00:00
Paul Scovanner
757dc6997a Update Security String to 2021-10-06 
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
(cherry picked from commit 61275cd338)
 2021-08-25 23:35:47 +00:00
Paul Scovanner
7ba6989f5d [automerge] Update Security String to 2021-10-06 2p: 61275cd338 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15676633

Bug: 193547118
Change-Id: Id8bd233e6f86d5499099ffdc980583cdb7b92cae
 2021-08-25 20:24:46 +00:00
Paul Scovanner
61275cd338 Update Security String to 2021-10-06 
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
 2021-08-25 20:24:40 +00:00
Paul Scovanner
e7a10a29da Update Security String to 2021-10-05 
Bug: 193547118
Change-Id: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
(cherry picked from commit 91cbb67645)
 2021-08-17 22:53:48 +00:00
Paul Scovanner
0005491f9b Update Security String to 2021-10-05 am: 91cbb67645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15559362

Change-Id: If292a34576d46ba5582fc86a9a5d68b90ab58eb8
 2021-08-13 23:00:30 +00:00
Paul Scovanner
91cbb67645 Update Security String to 2021-10-05 
Bug: 193547118
Change-Id: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
 2021-08-13 19:50:02 +00:00
Colin Cross
a45d0c890e Rename T to Tiramisu 
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Change-Id: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
 2021-07-23 21:05:16 +00:00
Paul Scovanner
be8bf158f0 Update Security String to 2021-09-05 am: cfd4896dc2 am: e88ac64d3d am: 7df23ee7aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I709412b554a94bbecd8bc8ae71f86188ec932943
 2021-06-30 23:04:35 +00:00
Paul Scovanner
7df23ee7aa Update Security String to 2021-09-05 am: cfd4896dc2 am: e88ac64d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I223dd4c0495601db35c400fdac944713b1d809a3
 2021-06-30 22:52:04 +00:00
Paul Scovanner
cfd4896dc2 Update Security String to 2021-09-05 
Bug: 192405736
Change-Id: Icea699ec7f82744ff0a6dca90068b2737129778a
 2021-06-30 00:36:24 +00:00
Colin Cross
5e9ba92e05 Master is T 
Bug: 186121492
Test: treehugger
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
Change-Id: Ie5ee4479ba98b9f4525b36e38493879a15661905
 2021-06-15 13:31:59 +00:00
Jeff Sharkey
3159f8f31b [DO NOT MERGE] platform/build/make - S is now REL am: 25d421446d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14884214

Change-Id: Ibe070a1f81c5e6456bc57a0d24df470e608e2de7
 2021-06-15 03:54:47 +00:00
Jeff Sharkey
4ef2e34cb5 Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev 2021-06-15 03:51:43 +00:00
Paul Scovanner
c57c536e09 Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff am: 073480991e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: I022dde955d07bc828b55474008fe5ff4f0362d71
 2021-06-14 22:02:19 +00:00
Paul Scovanner
073480991e Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Ifcfa2fd56abfd942b4af0a9a95e0150b95a0263f
 2021-06-14 21:56:38 +00:00
Paul Scovanner
f5139e3087 Update Security String to 2021-08-05 
Bug: 191053489
Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f
 2021-06-14 18:53:26 +00:00
Jeff Sharkey
25d421446d [DO NOT MERGE] platform/build/make - S is now REL 
Bug: 171506470
Test: Build
Change-Id: I98536ff83aab23cfaf5553a57a8a3b8264878847
 2021-06-10 15:05:11 -06:00
Jeff Sharkey
2ec10e7543 Merge "platform/build/make - S is now 31" into sc-dev am: 83ecfb5073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14748391

Change-Id: I68f42fbd7ef09dd357d010ac9a27272696414519
 2021-06-02 20:14:08 +00:00
Jeff Sharkey
fcc2b97e54 platform/build/make - S is now 31 
Bug: 171506470
Test: Build
Change-Id: I1f3475479659855c0185236f88bc388a61844968
 2021-06-02 10:19:19 -06:00
Colin Cross
5ef69b1ed4 Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" am: 54b437286b am: e131ab1e10 
Original change: https://android-review.googlesource.com/c/platform/build/+/1721370

Change-Id: I8ad39eb7f2ab075f60d03eb123392dc0488d9f72
 2021-06-01 22:27:44 +00:00
Colin Cross
45efdc4e0e Support all active codenames for BOARD_SYSTEMSDK_VERSIONS 
Use PLATFORM_VERSION_ALL_CODENAMES to construct PLATFORM_SYSTEMSDK_VERSIONS
so that both S and T are accepted while T is active but S is not finalized.

Bug: 186121492
Test: treehugger
Change-Id: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5
 2021-05-27 13:27:23 -07:00
Paul Scovanner
b8ae2c21e1 Update Security String to 2021-07-05 am: 64b00db8f4 am: e580c75611 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: Ie542698aef33599bf1e0d5315b58d2fcffada1d4
 2021-05-19 22:42:09 +00:00
Paul Scovanner
64b00db8f4 Update Security String to 2021-07-05 
Bug: 188458861
Change-Id: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
 2021-05-17 21:54:30 +00:00
Xin Li
7a2e4a990a DO NOT MERGE - Merge RQ2A.210505.003. 
Bug: 187544653
Merged-In: Ica626a3b19e5b642807234c288428cd7e0f40f98
Change-Id: I3ff9da08d4c59e59a50bc89a6f962b185f8d3942
 2021-05-07 18:51:09 -07:00
Bill Yi
21e8c35b78 Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE 
Merged-In: I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1
Merged-In: I9ae926913e3b6409e4b5ffff40ee72b2f42290ea
Change-Id: Icdb6feab48152418ee3e3d44a6d039225a11dbbf
 2021-04-13 19:31:56 -07:00
Paul Scovanner
b862fdf0a8 Update Security String to 2021-06-05 am: deaeaecae3 am: 9c4bacfd42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: I1d608ce127533022dc576b27ac0d5187894134b0
 2021-04-13 18:06:45 +00:00
Paul Scovanner
deaeaecae3 Update Security String to 2021-06-05 
Bug: 185154903
Change-Id: Ibfaf0bcc7e4525786eca62cafc7548030be40c61
 2021-04-12 21:03:24 +00:00
Paul Scovanner
aa90271881 Update Security String to 2021-05-05 
resolve merge conflicts of 321db2f846 to rvc-qpr-dev

Bug: 182937985
Change-Id: I248e89c967a3b02e072f477594a86b568d0f94a2
(cherry picked from commit 10e01bc865)
 2021-03-18 23:59:31 +00:00
Paul Scovanner
12002c3c3b Update Security String to 2021-05-05 am: 10e01bc865 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13920445

Change-Id: Ida116e9a8a8bf3a4bee041e13b6dbc012c646667
 2021-03-18 18:19:37 +00:00
Paul Scovanner
321db2f846 DO NOT MERGE 
Update Security String to 2021-05-05

Bug: 182937985
Change-Id: Ica626a3b19e5b642807234c288428cd7e0f40f98
 2021-03-17 20:26:59 +00:00