Commit graph

77932 commits

Author SHA1 Message Date
TreeHugger Robot
9ef4f2e339 Merge "Pixel Common: system_dlkm: avb hashtree footer" into tm-dev 2022-03-03 02:16:47 +00:00
Treehugger Robot
1d737629d0 Merge "Clean up merge_target_files" am: 5b48aeccb2 am: 168ea6a2b9 am: 6fd34f2965
Original change: https://android-review.googlesource.com/c/platform/build/+/2002319

Change-Id: Ieecc6bca70148a544ae77bf7c525a103d0581098
2022-03-03 01:01:46 +00:00
Treehugger Robot
6fd34f2965 Merge "Clean up merge_target_files" am: 5b48aeccb2 am: 168ea6a2b9
Original change: https://android-review.googlesource.com/c/platform/build/+/2002319

Change-Id: I1c6d5146f3b2cc45bf9a768161ab8dad40f15b01
2022-03-03 00:41:26 +00:00
Treehugger Robot
168ea6a2b9 Merge "Clean up merge_target_files" am: 5b48aeccb2
Original change: https://android-review.googlesource.com/c/platform/build/+/2002319

Change-Id: Iddd34c28b1272dd81bea8f155876f8f7b9e0a876
2022-03-03 00:19:21 +00:00
Treehugger Robot
5b48aeccb2 Merge "Clean up merge_target_files" 2022-03-02 23:51:31 +00:00
Ramji Jiyani
c3b0cc5fde Pixel Common: system_dlkm: avb hashtree footer
Add avb hashtree footer args for the system_dlkm
partition required for the T launch devices.

Bug: 222334390
Test: TH, manual build, Code testing gs101 & R6
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I7a28ccfa2acad2e20c35a8a68edbffcca068678e
2022-03-02 12:38:10 -08:00
Cole Faust
19e670ad2a Merge "Add Starlark implementation of add-product-dex-preopt-module-config" am: 339d56308d am: 3f8f28026e am: 9b65259574
Original change: https://android-review.googlesource.com/c/platform/build/+/2002313

Change-Id: I737334827408e55b989ef8626e9dd4ed8e3daef0
2022-03-02 19:53:07 +00:00
Cole Faust
9b65259574 Merge "Add Starlark implementation of add-product-dex-preopt-module-config" am: 339d56308d am: 3f8f28026e
Original change: https://android-review.googlesource.com/c/platform/build/+/2002313

Change-Id: I3168e53c1da9e76ef3fb6a72e7249a12b923d053
2022-03-02 19:32:13 +00:00
Cole Faust
3f8f28026e Merge "Add Starlark implementation of add-product-dex-preopt-module-config" am: 339d56308d
Original change: https://android-review.googlesource.com/c/platform/build/+/2002313

Change-Id: I951c84fd3ac06ad25ff8a3c7349ee61b767a400c
2022-03-02 19:07:51 +00:00
Cole Faust
339d56308d Merge "Add Starlark implementation of add-product-dex-preopt-module-config" 2022-03-02 18:40:36 +00:00
Neha Pattan
9ed8aef8bd Merge "(1/3) Remove SupplementalApi from BCP." into tm-dev 2022-03-02 16:22:56 +00:00
Paul Hu
54aed2b450 [automerger skipped] Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" am: 70dc07dbd3 am: 8b81343e39 am: 7fe3a47b68 -s ours
am skip reason: Merged-In I046503a60f39aa1ec6026c139203b1a1d5a7dab5 with SHA-1 3dfbfee02e is already in history

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

Change-Id: Id545c60badd151066199436a64e7d8f1939f1b36
2022-03-02 08:06:51 +00:00
Paul Hu
7fe3a47b68 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" am: 70dc07dbd3 am: 8b81343e39
Original change: https://android-review.googlesource.com/c/platform/build/+/1976806

Change-Id: Ib745287298e60a21f021e9d586c8cb9d0e6b2d6d
2022-03-02 07:48:40 +00:00
Paul Hu
8b81343e39 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" am: 70dc07dbd3
Original change: https://android-review.googlesource.com/c/platform/build/+/1976806

Change-Id: I1be61a70760e41474cd227a202a9ed19d29b384f
2022-03-02 07:27:23 +00:00
Paul Hu
70dc07dbd3 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" 2022-03-02 07:11:25 +00:00
Treehugger Robot
6194d460ef Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" am: ff17a1bd66 am: 857fa04e03 am: 7cdb6c016c
Original change: https://android-review.googlesource.com/c/platform/build/+/2004384

Change-Id: I5df49197679ca1a11e218615742da6c31797c2fe
2022-03-02 06:29:00 +00:00
Treehugger Robot
7cdb6c016c Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" am: ff17a1bd66 am: 857fa04e03
Original change: https://android-review.googlesource.com/c/platform/build/+/2004384

Change-Id: Icfa502d6ed2dde6cac992442458fafa2f8c199c4
2022-03-02 06:05:39 +00:00
Treehugger Robot
857fa04e03 Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" am: ff17a1bd66
Original change: https://android-review.googlesource.com/c/platform/build/+/2004384

Change-Id: I37e5fcc920a6fa9e4b64d4a63aaa881bfca82ce6
2022-03-02 05:33:43 +00:00
Treehugger Robot
ff17a1bd66 Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" 2022-03-02 05:08:27 +00:00
Treehugger Robot
6756539e27 Merge "Fix releasetools OWNERS for merge." am: 92c59c42d3 am: 7f0a03e6cc am: 945140a4b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2004390

Change-Id: Iacefea9a320c292c88c4357fa57343d7a533de82
2022-03-02 02:14:29 +00:00
Akilesh Kailash
d9b1c6319c Merge "Enable Async merge during OTA" am: 6eb483745b am: 5b33dc20ae am: dc40e465b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2001772

Change-Id: Ib4e6ecf3289a624ae4acd1b233268c90c938299c
2022-03-02 02:14:06 +00:00
Treehugger Robot
945140a4b4 Merge "Fix releasetools OWNERS for merge." am: 92c59c42d3 am: 7f0a03e6cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2004390

Change-Id: I8d11c9d7a5735ddc8ce6c346ec076ffbfa58bf40
2022-03-02 01:51:40 +00:00
Akilesh Kailash
dc40e465b4 Merge "Enable Async merge during OTA" am: 6eb483745b am: 5b33dc20ae
Original change: https://android-review.googlesource.com/c/platform/build/+/2001772

Change-Id: I863d615b6fa783df7c49303fd33d45360e674ccd
2022-03-02 01:51:20 +00:00
Treehugger Robot
7f0a03e6cc Merge "Fix releasetools OWNERS for merge." am: 92c59c42d3
Original change: https://android-review.googlesource.com/c/platform/build/+/2004390

Change-Id: I9d0d5bb54f7871cef5979210adb09e85b7fa6b5c
2022-03-02 01:39:43 +00:00
Treehugger Robot
92c59c42d3 Merge "Fix releasetools OWNERS for merge." 2022-03-02 01:32:34 +00:00
Akilesh Kailash
5b33dc20ae Merge "Enable Async merge during OTA" am: 6eb483745b
Original change: https://android-review.googlesource.com/c/platform/build/+/2001772

Change-Id: I18acbfd77ad2b5a615679eff74651fa54a9bfcef
2022-03-02 01:29:15 +00:00
Mitch Phillips
d51048acdd Revert "[cc_fuzz] Revert 'disable LTO' patches."
Revert "[cc_fuzz] Revert 'disable LTO' patches."

Revert submission 1976512-revert-nolto-fuzzing

Reason for revert: b/222160662
Reverted Changes:
Iacee4fa29:[cc_fuzz] Revert 'disable LTO' patches.
Ic509b00a1:[cc_fuzz] Revert 'disable LTO' patches.
If85931f09:[cc_fuzz] Revert 'disable LTO' patches.

Change-Id: I5f34731f0b7b27293636217f43d1cf5f17ab487b
2022-03-02 01:25:22 +00:00
Akilesh Kailash
6eb483745b Merge "Enable Async merge during OTA" 2022-03-02 01:05:24 +00:00
Colin Cross
ae4550ecd6 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135 am: 552c2d1c81 am: 400a979b88
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: Ib3921c70e5ba472126c9579d0ec3db3111a04635
2022-03-02 00:55:39 +00:00
Treehugger Robot
f6007f313d Merge "[cc_fuzz] Revert 'disable LTO' patches." am: df80322fcd am: 7bf9d4e1fa am: 2ff34809c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1976676

Change-Id: I34de9151a980fe4b948db746ccf21d5eb1f83905
2022-03-02 00:55:16 +00:00
Colin Cross
400a979b88 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135 am: 552c2d1c81
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: I184be6d3aa140d09d5c7e83c8b242fca704ebc38
2022-03-02 00:34:34 +00:00
Treehugger Robot
2ff34809c7 Merge "[cc_fuzz] Revert 'disable LTO' patches." am: df80322fcd am: 7bf9d4e1fa
Original change: https://android-review.googlesource.com/c/platform/build/+/1976676

Change-Id: I0c3453928e7da6aeba29bb4519e230d6dfb71c2b
2022-03-02 00:33:57 +00:00
Colin Cross
552c2d1c81 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: I06dd0a5eef6a5dd16b1fd4b2d845d0de2ef088c9
2022-03-02 00:13:01 +00:00
Treehugger Robot
7bf9d4e1fa Merge "[cc_fuzz] Revert 'disable LTO' patches." am: df80322fcd
Original change: https://android-review.googlesource.com/c/platform/build/+/1976676

Change-Id: I94fbac5906c7864a750792333060068650e51404
2022-03-02 00:11:53 +00:00
Colin Cross
1fa84f1135 Merge "Add PLATFORM_DISPLAY_VERSION" 2022-03-02 00:01:05 +00:00
Treehugger Robot
df80322fcd Merge "[cc_fuzz] Revert 'disable LTO' patches." 2022-03-01 23:43:04 +00:00
Daniel Norman
5177fcb28d Fix releasetools OWNERS for merge.
My extra _ meant that OWNERS was removed for merge_target_files.

Change-Id: I15f89b9edf31d126df19b66998520e8545cdfbd0
2022-03-01 17:58:34 +00:00
Nikita Ioffe
1483800095 Merge "Rename supplementalprocess->sdksandbox jars" into tm-dev 2022-03-01 17:08:45 +00:00
Nikita Ioffe
a1e2b3f913 Merge "Rename SupplementalProcess to SdkSandbox" into tm-dev 2022-03-01 17:07:15 +00:00
Liz Kammer
ba4b1d8cc1 Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" am: 16e2fc2da1 am: 0ac682fc9a am: 52f1ce8473
Original change: https://android-review.googlesource.com/c/platform/build/+/1966254

Change-Id: I7dc23d7fa503c42a66c12fc01d56fffa72861d1c
2022-03-01 16:34:48 +00:00
Liz Kammer
52f1ce8473 Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" am: 16e2fc2da1 am: 0ac682fc9a
Original change: https://android-review.googlesource.com/c/platform/build/+/1966254

Change-Id: I62a726a4d418efb6dc82b95cb5f5accf3af0bebb
2022-03-01 16:13:27 +00:00
Liz Kammer
0ac682fc9a Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" am: 16e2fc2da1
Original change: https://android-review.googlesource.com/c/platform/build/+/1966254

Change-Id: I789ab17d3f3b73e66502c90d9eb5cc32313514bd
2022-03-01 15:47:55 +00:00
Liz Kammer
16e2fc2da1 Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" 2022-03-01 15:19:34 +00:00
Yi-yo Chiang
848c69ac7c Merge changes from topic "gki-avb-vts" am: 9d164b6300 am: e93bc67cf8 am: 4e8705b181
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: I52ab0dc87855a1822bdb50d014544cecf67d7431
2022-03-01 05:57:34 +00:00
Yi-yo Chiang
4e8705b181 Merge changes from topic "gki-avb-vts" am: 9d164b6300 am: e93bc67cf8
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: Ie1685e3db923366676404465fe846d59f3559def
2022-03-01 05:36:25 +00:00
Yi-yo Chiang
e93bc67cf8 Merge changes from topic "gki-avb-vts" am: 9d164b6300
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: I2792c3946e3b0173b3592612009eafd62e1090cc
2022-03-01 05:12:46 +00:00
Yi-yo Chiang
9d164b6300 Merge changes from topic "gki-avb-vts"
* changes:
  releasetools: Update T GKI certification scheme
  Update T GKI certification scheme
2022-03-01 04:47:47 +00:00
Treehugger Robot
65386afc4b Merge "Add to OWNERS for merge tooling." am: 171c1e168e am: 0e0e961191 am: 6dde81f3f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2003097

Change-Id: Idd60080d0a87d9f59fcf4f050f53aa0464b44396
2022-03-01 03:10:20 +00:00
Treehugger Robot
1b9b2c14f0 Merge "Remove product debug files" am: fb3cdf5fc8 am: 7a8db6594e am: 675fc37660
Original change: https://android-review.googlesource.com/c/platform/build/+/2002318

Change-Id: I0e91c0fbda2e7ed332187cf881f51d2d4c145447
2022-03-01 03:10:12 +00:00
Treehugger Robot
6dde81f3f5 Merge "Add to OWNERS for merge tooling." am: 171c1e168e am: 0e0e961191
Original change: https://android-review.googlesource.com/c/platform/build/+/2003097

Change-Id: Ide10c28fb75d7df6f5cb3f3af524e944dd47ce4a
2022-03-01 02:47:34 +00:00