Commit Graph

74053 Commits

Author SHA1 Message Date
Colin Cross
61515f0c38 Merge "Move meta_lic files into per-module intermediates directories" am: dd93bd5b72 am: d24ec61b85 am: b50dfb7dbf
Original change: https://android-review.googlesource.com/c/platform/build/+/1906234

Change-Id: I4882f17181d0a84d390e67138a0a5cf78f387ffe
2021-12-02 23:42:03 +00:00
Colin Cross
b50dfb7dbf Merge "Move meta_lic files into per-module intermediates directories" am: dd93bd5b72 am: d24ec61b85
Original change: https://android-review.googlesource.com/c/platform/build/+/1906234

Change-Id: I8bfe709d76354b3f97588fa3ab8ebd7b09dc9ef3
2021-12-02 23:29:30 +00:00
Colin Cross
d24ec61b85 Merge "Move meta_lic files into per-module intermediates directories" am: dd93bd5b72
Original change: https://android-review.googlesource.com/c/platform/build/+/1906234

Change-Id: Id0864e473fc41db29f41284006858495476a26a9
2021-12-02 23:15:01 +00:00
Colin Cross
dd93bd5b72 Merge "Move meta_lic files into per-module intermediates directories" 2021-12-02 22:54:05 +00:00
Treehugger Robot
8b8bd8f2ba Merge "Remove 26.0 and 27.0 compat support" am: 5a0cef1c00 am: e802f38861 am: 4b2b6d9173
Original change: https://android-review.googlesource.com/c/platform/build/+/1904274

Change-Id: If8f879bb790a1b6a609933cf37551d5174d48cde
2021-12-02 07:18:15 +00:00
Treehugger Robot
4b2b6d9173 Merge "Remove 26.0 and 27.0 compat support" am: 5a0cef1c00 am: e802f38861
Original change: https://android-review.googlesource.com/c/platform/build/+/1904274

Change-Id: I5446f984956881441d4262de28fb7077fc100e54
2021-12-02 07:03:46 +00:00
Treehugger Robot
e802f38861 Merge "Remove 26.0 and 27.0 compat support" am: 5a0cef1c00
Original change: https://android-review.googlesource.com/c/platform/build/+/1904274

Change-Id: I299faad441b394d731b7ec0526b0954dfe995c1a
2021-12-02 06:46:29 +00:00
Treehugger Robot
5a0cef1c00 Merge "Remove 26.0 and 27.0 compat support" 2021-12-02 06:26:58 +00:00
Cole Faust
4e04eaa46f Merge "Strip more board config variables" am: b3eb2087df am: c8305d10b7 am: ff5540724f
Original change: https://android-review.googlesource.com/c/platform/build/+/1905890

Change-Id: I90c9154530a8970bdaee02a1fe8d45b535ae063d
2021-12-02 00:54:46 +00:00
Cole Faust
ff5540724f Merge "Strip more board config variables" am: b3eb2087df am: c8305d10b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1905890

Change-Id: Ic7d8230160271f4e397d46a8faf73654978aa744
2021-12-02 00:08:38 +00:00
Treehugger Robot
325468c518 Merge "Add 32.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: b5373a9845 am: 109643a5cc am: 8455d3a36d
Original change: https://android-review.googlesource.com/c/platform/build/+/1906151

Change-Id: Ic7c9b944247ba53b4a8cb4b17a3660584a0de1f0
2021-12-02 00:01:05 +00:00
Cole Faust
c8305d10b7 Merge "Strip more board config variables" am: b3eb2087df
Original change: https://android-review.googlesource.com/c/platform/build/+/1905890

Change-Id: Ia50a0ef99f533612a8b4cc3c33df424983b1566c
2021-12-01 23:50:07 +00:00
Treehugger Robot
8455d3a36d Merge "Add 32.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: b5373a9845 am: 109643a5cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1906151

Change-Id: I9175d3fc5d169dc045155e1399edcdbdc4e02afd
2021-12-01 23:43:08 +00:00
Cole Faust
a6e74d1816 Merge "Correctly copy the board configuration input variables" am: f900cb4c12 am: 15ff08eaa4 am: 0f25a409ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1905476

Change-Id: Ib39bbd39208745f9887b5dcfff567e100d52a190
2021-12-01 23:30:47 +00:00
Cole Faust
b3eb2087df Merge "Strip more board config variables" 2021-12-01 23:30:32 +00:00
Treehugger Robot
109643a5cc Merge "Add 32.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: b5373a9845
Original change: https://android-review.googlesource.com/c/platform/build/+/1906151

Change-Id: I1d8b4d2c3212d2235c278a951d7808a4a1294068
2021-12-01 23:25:54 +00:00
Cole Faust
0f25a409ae Merge "Correctly copy the board configuration input variables" am: f900cb4c12 am: 15ff08eaa4
Original change: https://android-review.googlesource.com/c/platform/build/+/1905476

Change-Id: I06650a685ce6bf8c9325ba3f5c09d5bfbcb1301c
2021-12-01 23:15:08 +00:00
Treehugger Robot
b5373a9845 Merge "Add 32.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2021-12-01 23:10:38 +00:00
Cole Faust
15ff08eaa4 Merge "Correctly copy the board configuration input variables" am: f900cb4c12
Original change: https://android-review.googlesource.com/c/platform/build/+/1905476

Change-Id: I490a30c0978fb7aed58492977b26e64d10504f86
2021-12-01 22:56:22 +00:00
Colin Cross
6b5c037928 Merge "Remove duplicate includes of BUILD_NOTICE_FILE" am: 3db143c452 am: 0238985e0f am: 9b5cb6a6ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1906235

Change-Id: I6dd9c29b4df09f188ea0e995da1ff8a4a6491eb5
2021-12-01 22:38:46 +00:00
Colin Cross
44858d35ce Move meta_lic files into per-module intermediates directories
Store the meta_lic files in the per-module intermediates directories
to avoid conflating multiple variants for the same module, for example
host and device.

Bug: 207445310
Test: m checkbuild
Change-Id: I2b0ca22c1f7b069f79d2026707be3294c488f6de
2021-12-01 14:38:13 -08:00
Cole Faust
f900cb4c12 Merge "Correctly copy the board configuration input variables" 2021-12-01 22:37:09 +00:00
Colin Cross
9b5cb6a6ed Merge "Remove duplicate includes of BUILD_NOTICE_FILE" am: 3db143c452 am: 0238985e0f
Original change: https://android-review.googlesource.com/c/platform/build/+/1906235

Change-Id: I9c635cc792d8df3d3b1721200a9f0dadf6689002
2021-12-01 22:21:24 +00:00
Colin Cross
0238985e0f Merge "Remove duplicate includes of BUILD_NOTICE_FILE" am: 3db143c452
Original change: https://android-review.googlesource.com/c/platform/build/+/1906235

Change-Id: Ic30b2455c2155cac186caf032ddc66e09fbb5488
2021-12-01 22:02:23 +00:00
Colin Cross
3db143c452 Merge "Remove duplicate includes of BUILD_NOTICE_FILE" 2021-12-01 21:08:12 +00:00
Cole Faust
3be5b72ad6 Correctly copy the board configuration input variables
dict(**h[0]) was only copying the top level dictionary
object, but not any other dictionaries/lists inside of
it. This was causing us to not find all the changes to
variables the board configuration was making, and so
some variables were not included in the output.

Bug: 201700692
Test: ./build/bazel/ci/rbc_regression_test.sh mainline_system_x86_64-userdebug
Test: ./out/soong/rbcrun ./build/make/tests/run.rbc
Change-Id: I4467eead7e597f6f49119a8c4832126f39d646e7
2021-12-01 11:06:23 -08:00
Tianjie Xu
b6765ff3e5 Merge "Revert "Temporarily remove the care_map in the ota package"" am: fab626b7d0 am: 1cdcb088bb am: a8c667a4b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1907490

Change-Id: I9ed375e28b2193a1804be7544cb4834e50ad69b3
2021-12-01 19:01:38 +00:00
Tianjie Xu
a8c667a4b7 Merge "Revert "Temporarily remove the care_map in the ota package"" am: fab626b7d0 am: 1cdcb088bb
Original change: https://android-review.googlesource.com/c/platform/build/+/1907490

Change-Id: I8fcb0a0dac7c89e37bf08f96e8778e5aba68da7a
2021-12-01 18:49:53 +00:00
Tianjie Xu
1cdcb088bb Merge "Revert "Temporarily remove the care_map in the ota package"" am: fab626b7d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1907490

Change-Id: I71ab1328f8082659385b0471c5b2ee93786fbc34
2021-12-01 18:38:14 +00:00
Tianjie Xu
fab626b7d0 Merge "Revert "Temporarily remove the care_map in the ota package"" 2021-12-01 18:23:41 +00:00
Jiakai Zhang
459584be7f Merge "Add a variable to specify standalone system server jars." am: 1ecb2f952c am: 4207daaf8e am: bfa878e9de
Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: Ieb8d2df9e9e7e6d6746f0cbb8c86d13ad6f7e148
2021-12-01 13:00:01 +00:00
Kedar Chitnis
0ec384a277 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" am: 161c7aa777 am: 517ac35b68 am: 0ef40dbf78
Original change: https://android-review.googlesource.com/c/platform/build/+/1894958

Change-Id: I5abf92a77847613a62911d12b6b95557f20a715f
2021-12-01 12:59:46 +00:00
Jiakai Zhang
bfa878e9de Merge "Add a variable to specify standalone system server jars." am: 1ecb2f952c am: 4207daaf8e
Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: I78d1c4e2f39f90263d52aa06d0b1a33466f8918e
2021-12-01 12:43:17 +00:00
Kedar Chitnis
0ef40dbf78 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" am: 161c7aa777 am: 517ac35b68
Original change: https://android-review.googlesource.com/c/platform/build/+/1894958

Change-Id: I0127304961cd75704c6195e88676ebde967d5eb1
2021-12-01 12:43:03 +00:00
Jiakai Zhang
4207daaf8e Merge "Add a variable to specify standalone system server jars." am: 1ecb2f952c
Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: I1ba1cedc1da159c654675f7895e31c4ac8d6e92a
2021-12-01 12:37:48 +00:00
Kedar Chitnis
517ac35b68 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" am: 161c7aa777
Original change: https://android-review.googlesource.com/c/platform/build/+/1894958

Change-Id: I5f891e113b6a88136bf710f550f1e6edda01e981
2021-12-01 12:30:31 +00:00
Jiakai Zhang
1ecb2f952c Merge "Add a variable to specify standalone system server jars." 2021-12-01 12:29:37 +00:00
Kedar Chitnis
161c7aa777 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" 2021-12-01 12:16:33 +00:00
Tianjie Xu
2f76f90616 Revert "Temporarily remove the care_map in the ota package"
This reverts commit 5856cfbf82.

Reason for revert: re-enable care_map b/205541521

Change-Id: I64b4637991a80c9d08a28bdd324c47b4067b1762
2021-12-01 05:54:27 +00:00
David Anderson
161afa9b6a Merge "build_image: Query the actual image size after invoking the final mkfs." am: 0096a750c2 am: 965ca0d965 am: f301d211d8
Original change: https://android-review.googlesource.com/c/platform/build/+/1889816

Change-Id: I755ca7259857d6d5a0ed5fd6d07472b18812d9b7
2021-12-01 04:17:34 +00:00
David Anderson
f301d211d8 Merge "build_image: Query the actual image size after invoking the final mkfs." am: 0096a750c2 am: 965ca0d965
Original change: https://android-review.googlesource.com/c/platform/build/+/1889816

Change-Id: I57810153d176b5f7ea034eafefa4d56275ceaed1
2021-12-01 04:01:08 +00:00
David Anderson
965ca0d965 Merge "build_image: Query the actual image size after invoking the final mkfs." am: 0096a750c2
Original change: https://android-review.googlesource.com/c/platform/build/+/1889816

Change-Id: Id05c93d2115fdb6d0e83fe6bf271cb325d18cdb9
2021-12-01 03:49:03 +00:00
David Anderson
0096a750c2 Merge "build_image: Query the actual image size after invoking the final mkfs." 2021-12-01 03:28:10 +00:00
Treehugger Robot
c6301ef5c4 Merge "Define $(PRODUCT_OUT) before running the board config" am: 9118768352 am: 52057e2add am: 2acb9ac6c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1906551

Change-Id: I67df6828e95f33190eb3315568cc3238cb657216
2021-12-01 02:06:35 +00:00
Treehugger Robot
2acb9ac6c3 Merge "Define $(PRODUCT_OUT) before running the board config" am: 9118768352 am: 52057e2add
Original change: https://android-review.googlesource.com/c/platform/build/+/1906551

Change-Id: I60a4e8bd53361744920842df608bf047a3ab871b
2021-12-01 01:53:36 +00:00
Treehugger Robot
52057e2add Merge "Define $(PRODUCT_OUT) before running the board config" am: 9118768352
Original change: https://android-review.googlesource.com/c/platform/build/+/1906551

Change-Id: Ib04008cd88fc38ce8cf83cfecd52e3ebe6ff921a
2021-12-01 01:37:17 +00:00
Treehugger Robot
9118768352 Merge "Define $(PRODUCT_OUT) before running the board config" 2021-12-01 01:15:53 +00:00
Treehugger Robot
12f91e39f2 Merge "Embed zucchini version info in target_files" am: a9bc0e1db5 am: 68a38e8e95 am: d3e90e46cf
Original change: https://android-review.googlesource.com/c/platform/build/+/1906834

Change-Id: Ieb15661ec64a344087c7672becea09db3356e822
2021-12-01 00:29:28 +00:00
Treehugger Robot
d3e90e46cf Merge "Embed zucchini version info in target_files" am: a9bc0e1db5 am: 68a38e8e95
Original change: https://android-review.googlesource.com/c/platform/build/+/1906834

Change-Id: Id8667496899b6b513450ee71d69b1b7ee2a04eec
2021-12-01 00:14:04 +00:00
Treehugger Robot
68a38e8e95 Merge "Embed zucchini version info in target_files" am: a9bc0e1db5
Original change: https://android-review.googlesource.com/c/platform/build/+/1906834

Change-Id: I448ed55d3ae30bcadc64893753330ce5f19d0fbe
2021-11-30 23:57:42 +00:00