StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,721 Commits 1 Branch 0 Tags
ff640376c1102499c25ded9e4526f223853e948e
Commit Graph

72721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
ff640376c1 Merge "Update base sdk extension version to 1" into stage-aosp-master am: 200bada63c am: 311dfa0ef3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15934175

Change-Id: Ie98f3916011e255252d1a49762f17a278edfd297
 2021-09-30 13:21:21 +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
Anton Hansson
200bada63c Merge "Update base sdk extension version to 1" into stage-aosp-master 2021-09-30 12:49:03 +00:00
Treehugger Robot
5d13787183 Merge "Show mk2rbc warnings when they occur" am: 64bc620d8c am: b4dcb50d1f am: 63aa5e048e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1839198

Change-Id: I5e4bba9356b68ffe3c056cee1be6c7cf240e556a
 2021-09-30 01:17:56 +00:00
Treehugger Robot
63aa5e048e Merge "Show mk2rbc warnings when they occur" am: 64bc620d8c am: b4dcb50d1f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1839198

Change-Id: I10c23cfe47d1d4e1a2340c9bf4767b34109e4881
 2021-09-30 00:58:16 +00:00
Treehugger Robot
b4dcb50d1f Merge "Show mk2rbc warnings when they occur" am: 64bc620d8c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1839198

Change-Id: I42248bdf71f73686412cb2eb7dcf659ceb61c074
 2021-09-30 00:45:11 +00:00
Treehugger Robot
64bc620d8c Merge "Show mk2rbc warnings when they occur" 2021-09-30 00:32:45 +00:00
Colin Cross
e7b34714cc [automerger skipped] Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev am: 2b595c26d1 -s ours 
am skip reason: Merged-In I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4 with SHA-1 cc2f12f133 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15905749

Change-Id: Ic2732a4b6152adb47ff565496416239b8781cafe
 2021-09-29 17:13:19 +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
Treehugger Robot
63759143e3 Merge "Fix parsing issues in board_config.mk" am: f482a6aa3a am: c4b0e4f1cd am: 898e531d0a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1839200

Change-Id: I492d671dc4b91ab3ed24fcab72bfd9800785c103
 2021-09-29 16:24: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
Treehugger Robot
898e531d0a Merge "Fix parsing issues in board_config.mk" am: f482a6aa3a am: c4b0e4f1cd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1839200

Change-Id: I47aef52ece71bfe96a7a31fba1f76b060f966094
 2021-09-29 16:13:21 +00:00
Treehugger Robot
c4b0e4f1cd Merge "Fix parsing issues in board_config.mk" am: f482a6aa3a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1839200

Change-Id: I732f4aeea701961784ab3897fd1a2eda1440f049
 2021-09-29 15:57:03 +00:00
Treehugger Robot
f482a6aa3a Merge "Fix parsing issues in board_config.mk" 2021-09-29 15:46:45 +00:00
Xin Li
1627a23e23 [automerger skipped] Merge SP1A.210812.016 am: 68b4fefd60 -s ours am: c19f3f485b -s ours 
am skip reason: Merged-In I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e with SHA-1 61275cd338 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15932344

Change-Id: I14c6b3d80868b358df691d60e9bc4498ecaf98f4
 2021-09-29 05:52:00 +00:00
Xin Li
c19f3f485b [automerger skipped] Merge SP1A.210812.016 am: 68b4fefd60 -s ours 
am skip reason: Merged-In I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e with SHA-1 61275cd338 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15932344

Change-Id: If40da1d259573c37e2cc7b5da6eaf363740e5b6e
 2021-09-29 05:38:39 +00:00
Cole Faust
e96edc34ce Fix parsing issues in board_config.mk 
Soong's "androidmk" makefile parser couldn't parse
board_config.mk due to these issues.

Fixes: 201440410
Test: Manually
Change-Id: I2dc298fb969a140e14f704a8c9f9f2ec98be7bc0
 2021-09-28 12:43:04 -07:00
Xin Li
68b4fefd60 Merge SP1A.210812.016 
Merged-In: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
Change-Id: I4777de3e09216497b88f6916f8a5997e4cd10743
 2021-09-28 19:25:30 +00:00
Cole Faust
ee8cd58a85 Show mk2rbc warnings when they occur 
There was a missing $ for variable expansion,
and $(info) does not seem to show up in soong output,
but $(warning) does.

Fixes: 201431870
Test: After introducing a problem in mk2rbc: m RBC_PRODUCT_CONFIG=1 nothing
Change-Id: Ife7786d27a7315e873ea125ca361e684ffb79e1e
 2021-09-28 11:30:03 -07:00
Xin Li
b0e810b5c5 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 023a4e70f4 am: cb45ba760e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15930770

Change-Id: Iad5b1070bd5e2a839b28e78b3cb9511047178131
 2021-09-28 15:01:39 +00:00
Xin Li
cb45ba760e DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 023a4e70f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15930770

Change-Id: I0b9423abb6ca7dce8215b4b6cbd1edf99577fd3d
 2021-09-28 14:43:12 +00:00
Xin Li
023a4e70f4 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged 
Merged-In: Ie525a97b437a3ce4c960754de727a5af0feadc98
Change-Id: I9f7eb9ed0c06bdf7a59472635e2c0d4ffe798a60
 2021-09-28 07:55:09 +00:00
Adam Shih
e2363e99d3 Merge "create a makefile that holds non AB device setting" am: 95e5729ee5 am: 869356db7f am: d08364ae1e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1774706

Change-Id: I237da3dc3ac0bcd7d1af9d9157fd6d88037d9347
 2021-09-28 04:18:32 +00:00
Adam Shih
d08364ae1e Merge "create a makefile that holds non AB device setting" am: 95e5729ee5 am: 869356db7f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1774706

Change-Id: I616f8784de158536a334b5a86393c845fe69c9ff
 2021-09-28 04:08:40 +00:00
Adam Shih
869356db7f Merge "create a makefile that holds non AB device setting" am: 95e5729ee5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1774706

Change-Id: I3c94bb10b40a80d982dfceb0902f866d1ca24dea
 2021-09-28 03:53:54 +00:00
Adam Shih
95e5729ee5 Merge "create a makefile that holds non AB device setting" 2021-09-28 03:36:43 +00:00
Treehugger Robot
0c50c31acf Merge "Fix aosp_x86_64-user build failure" am: 0b08b8dc14 am: 38a6187cb2 am: acf14dbaba 
Original change: https://android-review.googlesource.com/c/platform/build/+/1836119

Change-Id: I0fed68a1acedfb62ceec8a6f135a6468d21d0981
 2021-09-27 16:41:25 +00:00
Treehugger Robot
acf14dbaba Merge "Fix aosp_x86_64-user build failure" am: 0b08b8dc14 am: 38a6187cb2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1836119

Change-Id: Ie919d2ea394187848b169ddf8dd70cbc2123a421
 2021-09-27 16:26:33 +00:00
Treehugger Robot
38a6187cb2 Merge "Fix aosp_x86_64-user build failure" am: 0b08b8dc14 
Original change: https://android-review.googlesource.com/c/platform/build/+/1836119

Change-Id: Ie56f7610218317f8a67defe063b3499c88939441
 2021-09-27 16:06:27 +00:00
Treehugger Robot
0b08b8dc14 Merge "Fix aosp_x86_64-user build failure" 2021-09-27 15:51:27 +00:00
Jiakai Zhang
65085a2bd7 Merge "Remove dalvik.vm.dex2oat-updatable-bcp-packages-file." am: 315e32a904 am: 5c55d4ab75 am: 0c81c45963 
Original change: https://android-review.googlesource.com/c/platform/build/+/1833558

Change-Id: I66a1979e06ad97449cc9d66423f904a912c13029
 2021-09-27 12:29:34 +00:00
Jiakai Zhang
0c81c45963 Merge "Remove dalvik.vm.dex2oat-updatable-bcp-packages-file." am: 315e32a904 am: 5c55d4ab75 
Original change: https://android-review.googlesource.com/c/platform/build/+/1833558

Change-Id: Iaae8eb4a7f04daa5ab2dc2182ad82398688bf5ae
 2021-09-27 12:15:50 +00:00
Jiakai Zhang
5c55d4ab75 Merge "Remove dalvik.vm.dex2oat-updatable-bcp-packages-file." am: 315e32a904 
Original change: https://android-review.googlesource.com/c/platform/build/+/1833558

Change-Id: Ib82b28114cc9eee3aff919e2207d71defcd09d1c
 2021-09-27 11:55:00 +00:00
Treehugger Robot
c4c69f4cfe Merge "Add more sepolicy variables to soong_config" am: 2c8d7798cd am: 687c66b021 am: d47b774373 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826139

Change-Id: Iee8df3ba17472a3b3ccdc4f6558ba1de4c8d1313
 2021-09-27 11:49:33 +00:00
Jiakai Zhang
315e32a904 Merge "Remove dalvik.vm.dex2oat-updatable-bcp-packages-file." 2021-09-27 11:38:26 +00:00
Treehugger Robot
d47b774373 Merge "Add more sepolicy variables to soong_config" am: 2c8d7798cd am: 687c66b021 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826139

Change-Id: I8b912cdc08f8f5dd60493ec27aeedcbdd3761921
 2021-09-27 11:36:04 +00:00
Treehugger Robot
687c66b021 Merge "Add more sepolicy variables to soong_config" am: 2c8d7798cd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826139

Change-Id: Ia51d77efa4576f5feadd60f1d927c4990e462985
 2021-09-27 11:20:39 +00:00
Treehugger Robot
2c8d7798cd Merge "Add more sepolicy variables to soong_config" 2021-09-27 11:05:19 +00:00
Bowgo Tsai
aba5c9eacd Fix aosp_x86_64-user build failure 
Commit Ia982eb2ee3d1eb64db72c1836e433bcc53e71e3f removes boot-5.4.img
and leaves only a boot-5.10.img file, which makes 'boot_container'
become false. This leads to the failure in AddVbmetaDigest() as it will
search a 'boot.img' based on the 'boot' descriptor from the vbmeta.img.

Add a condition that if boot_images[0] is not 'boot.img' then the
build is also a boot container.

Bug: 199807830
Test: build aosp_x86_64-user
Change-Id: I4a9487b075186f0abf2ba74d3a1cf78072352a05
 2021-09-27 14:11:14 +08:00
Jiakai Zhang
f7523888d8 Remove dalvik.vm.dex2oat-updatable-bcp-packages-file. 
This system property is no longer needed.

Bug: 200241946
Test: Presubmits
Change-Id: If86551ac511f29e3ec2ff992695cecbb0dd58bb6
 2021-09-26 03:36:30 +00:00
Treehugger Robot
fc2f24e849 Merge "Renames boot-debug-*.img in GSI targets" am: b7aced88d6 am: d995c9e246 am: d8c1450d54 
Original change: https://android-review.googlesource.com/c/platform/build/+/1833559

Change-Id: I1ed8af53fa09b7965009cc091912b0ca50c15a28
 2021-09-25 04:19:31 +00:00
Treehugger Robot
d8c1450d54 Merge "Renames boot-debug-*.img in GSI targets" am: b7aced88d6 am: d995c9e246 
Original change: https://android-review.googlesource.com/c/platform/build/+/1833559

Change-Id: I86df86c895440f1066fe5ab2bb055fd97d3dc85b
 2021-09-25 04:04:37 +00:00
Treehugger Robot
d995c9e246 Merge "Renames boot-debug-*.img in GSI targets" am: b7aced88d6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1833559

Change-Id: I77024efd9f0281e40397bdebfab4160997bb50dc
 2021-09-25 03:50:32 +00:00
Treehugger Robot
b7aced88d6 Merge "Renames boot-debug-*.img in GSI targets" 2021-09-25 03:33:40 +00:00
Treehugger Robot
21947a15cb Merge "Return find_and_copy result in sorted order." am: 128bfc440e am: 73c444b40e am: e3eb897949 
Original change: https://android-review.googlesource.com/c/platform/build/+/1836494

Change-Id: Idea8479e5c203942958893679421aa1e6fc42c31
 2021-09-25 03:09:43 +00:00
Treehugger Robot
e3eb897949 Merge "Return find_and_copy result in sorted order." am: 128bfc440e am: 73c444b40e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1836494

Change-Id: Ic40097a497db49cb3566b67bb69b93dc52033fca
 2021-09-25 02:54:43 +00:00
Treehugger Robot
73c444b40e Merge "Return find_and_copy result in sorted order." am: 128bfc440e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1836494

Change-Id: I44bf1da6108f9a0f4974b73ab252fd1d2e2b23b8
 2021-09-25 02:44:50 +00:00
Treehugger Robot
128bfc440e Merge "Return find_and_copy result in sorted order." 2021-09-25 02:27:35 +00:00
David Anderson
a23ba93f45 Merge "Allow changing the EROFS compressor." am: 684e74ae15 am: 6d3e5ac6e7 am: 441fd282ca 
Original change: https://android-review.googlesource.com/c/platform/build/+/1833630

Change-Id: I6dd2f5b82d20aa4588e130ebff2d27e9d3d7ab78
 2021-09-24 19:54:33 +00:00
David Anderson
441fd282ca Merge "Allow changing the EROFS compressor." am: 684e74ae15 am: 6d3e5ac6e7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1833630

Change-Id: I6be84d01b565395e1cb37181399ce0c27036bf19
 2021-09-24 19:43:34 +00:00