Commit Graph

33647 Commits

Author SHA1 Message Date
Anton Hansson e879d64cf8 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" am: b0d0710f67 am: ebf442153d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4c4293da87ba27b18d7cd4107f907f44db14ae9
2021-01-28 17:00:51 +00:00
Anton Hansson ebf442153d Merge "Fix prebuilt_apis creating of "latest" incompatibilities" am: b0d0710f67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3b42313c6890dc57c4c27123889c89bc0a783eb
2021-01-28 16:52:09 +00:00
Paul Duffin e36b8727c1 Merge "Add boot_image module type" am: b9d731c8a9 am: 70b8c656c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06be6aab301bb86e24e253fa7b6d94cba258b02a
2021-01-28 16:48:30 +00:00
Anton Hansson b0d0710f67 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" 2021-01-28 16:48:16 +00:00
Paul Duffin 70b8c656c6 Merge "Add boot_image module type" am: b9d731c8a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29f2ed721092ab23f56baaa0777e8960971f5856
2021-01-28 16:06:35 +00:00
Paul Duffin b9d731c8a9 Merge "Add boot_image module type" 2021-01-28 15:39:57 +00:00
Treehugger Robot 2ebe689bbf Merge "apex: checks min_sdk_version for preview/current" am: 99afe0d442 am: 3f4cc86f15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557545

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e8ae9caa5233c3738ee51da8980b2bc8f9dc995
2021-01-28 14:15:36 +00:00
Treehugger Robot 3f4cc86f15 Merge "apex: checks min_sdk_version for preview/current" am: 99afe0d442
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557545

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If08666fb01725897410c6dad94f2c7cc087d90c4
2021-01-28 13:38:41 +00:00
Treehugger Robot 99afe0d442 Merge "apex: checks min_sdk_version for preview/current" 2021-01-28 13:04:52 +00:00
Jingwen Chen 5735458173 Merge changes Ie5f793a0,I9b9674ba am: 3b171f4013 am: 8179ddae36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ee8a59a3ad9416670e398b427360a917734d310
2021-01-28 04:28:15 +00:00
Bob Badour b50845a745 Add APSL reciprocal licenses. am: 304fe7f197 am: 0bea56b5a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1562556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d6f837476f2680b3931c0c63510a86137d7ce7b
2021-01-28 04:27:59 +00:00
Jingwen Chen 8179ddae36 Merge changes Ie5f793a0,I9b9674ba am: 3b171f4013
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58ceeced944218393cdeffff08e03d21d80e4345
2021-01-28 03:59:22 +00:00
Bob Badour 0bea56b5a9 Add APSL reciprocal licenses. am: 304fe7f197
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1562556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5afb3347a9e34198cbc5d891daa0dc192ea73fb1
2021-01-28 03:58:21 +00:00
Jingwen Chen 3b171f4013 Merge changes Ie5f793a0,I9b9674ba
* changes:
  bp2build: support Starlark rules and load statements.
  Make bp2buildMutators registration local to TestContext.
2021-01-28 03:35:48 +00:00
Bob Badour 304fe7f197 Add APSL reciprocal licenses.
Test: m all

Bug: 151953481
Bug: 151177513
Bug: 67772237
Change-Id: Ia719741cb0dd3e5f8230f637c321c82377f022dc
2021-01-27 16:51:36 -08:00
Treehugger Robot a233dd5fda Merge "Add system/extras/simpleperf to Rust allowed paths" am: 8a0f212bfa am: a1df4dd3a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51122785787912777e3927a31893c7b85b4a8d89
2021-01-27 14:16:27 +00:00
Treehugger Robot a1df4dd3a2 Merge "Add system/extras/simpleperf to Rust allowed paths" am: 8a0f212bfa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie99e010b017030a8753a6db56ce462c49df84c10
2021-01-27 13:32:50 +00:00
Treehugger Robot 8a0f212bfa Merge "Add system/extras/simpleperf to Rust allowed paths" 2021-01-27 12:13:55 +00:00
Paul Duffin 1999d04d2a Merge "Make com.android.art related tests more realistic" am: 57eec1007e am: 65964a6a90
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94ef60fc464b13d609d8482675918094453de884
2021-01-27 11:02:45 +00:00
Paul Duffin 65964a6a90 Merge "Make com.android.art related tests more realistic" am: 57eec1007e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52e76fb5c2b3f38a99129b2bc33f49f6ddac330a
2021-01-27 10:25:51 +00:00
Paul Duffin 57eec1007e Merge "Make com.android.art related tests more realistic" 2021-01-27 10:03:42 +00:00
Yi Kong 2c9b3e0e25 Add system/extras/simpleperf to Rust allowed paths
This is to allow simpleperf to export rust bindings for use by
profcollect.

Test: build
Change-Id: I187139d6133c144e86cbdb05d20c2515c189718e
2021-01-27 15:48:31 +08:00
Jingwen Chen 40067de675 bp2build: support Starlark rules and load statements.
This CL adds support to bp2build for declaring the location of the
Starlark rule definition when creating BazelTargetModules. This is
needed for non-native rules that needs to be loaded from .bzl files
somewhere in the tree.

Since load statements are aggregated at the top of the BUILD file, away
from the targets that actually use them, this CL also introduces an
abstraction to group BazelTargets together and compute their load
statements and target string representations separately, allowing load
statements to be decoupled and written into a BUILD file before the
targets themselves.

Test: soong tests
Test: TH
Test: GENERATE_BAZEL_FILES=true m nothing && build/bazel/scripts/bp2build-sync.sh write && bazel cquery //bionic/...
Fixes: 178531760

Test: TH
Change-Id: Ie5f793a00006eb024eaef07ddd9fde7aaefc054e
2021-01-26 22:46:20 -05:00
Jingwen Chen a42d6417b3 Make bp2buildMutators registration local to TestContext.
The previous implementation relied on the implicit registration of Bp2Build mutators, resulting in test non-hermeticity. Refactor bp2build tests to explicitly specify the bp2build mutators under test.

Test: Soong tests

Test: TH
Change-Id: I9b9674bad1ea533b3bd31b07077a9e02c99b4c1d
2021-01-26 21:57:27 -05:00
Treehugger Robot 7b093c5317 Merge "update apex allowed deps-2" am: fcf2da0b29 am: 9a2a87f6e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560310

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d778ad95e4d5fcc12c646e4bdf65850470aa804
2021-01-27 01:24:20 +00:00
Treehugger Robot 9a2a87f6e2 Merge "update apex allowed deps-2" am: fcf2da0b29
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560310

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5f89115eaa928b0c7e68cf690de0eec72b12e17
2021-01-27 01:15:55 +00:00
Treehugger Robot 8f4d56d393 Merge "multiproduct_kati: increase ram per job to 25GB" am: fb7c675ecf am: 134c52fd0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561076

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I095edc2dd6b7f0efe20f141e7dc2a25830d5c484
2021-01-27 01:14:10 +00:00
Treehugger Robot ab2803a870 Merge "Add FAILED: prefix to RBE Fatal error message" am: 2e0598ddc3 am: 13bb117f3b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560871

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00e2cb26eb3e1e3b695ba067cad24f45169f3a58
2021-01-27 01:14:00 +00:00
Treehugger Robot 7a162f2857 Merge "Don't use "echo -e" when creating prop file" am: 6c1eb446eb am: 113baac21e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcd4e8f6c13b4e74cbfcad16758fae218d91a99d
2021-01-27 01:13:20 +00:00
Treehugger Robot fcf2da0b29 Merge "update apex allowed deps-2" 2021-01-27 01:06:48 +00:00
Treehugger Robot 134c52fd0f Merge "multiproduct_kati: increase ram per job to 25GB" am: fb7c675ecf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1561076

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie46f29e6413d27bcc21c6b75194f87a14fa816d3
2021-01-27 01:01:37 +00:00
Treehugger Robot fb7c675ecf Merge "multiproduct_kati: increase ram per job to 25GB" 2021-01-27 01:00:51 +00:00
Treehugger Robot 13bb117f3b Merge "Add FAILED: prefix to RBE Fatal error message" am: 2e0598ddc3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560871

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic50a38f89cd212452db5caa642eaa8c40559b8ff
2021-01-27 01:00:45 +00:00
Treehugger Robot 2e0598ddc3 Merge "Add FAILED: prefix to RBE Fatal error message" 2021-01-27 00:50:53 +00:00
Treehugger Robot 113baac21e Merge "Don't use "echo -e" when creating prop file" am: 6c1eb446eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1557546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6be5bd026229f05f9a7ae298c12410afa3beb6b6
2021-01-27 00:47:27 +00:00
Treehugger Robot 6c1eb446eb Merge "Don't use "echo -e" when creating prop file" 2021-01-26 23:47:46 +00:00
Jingwen Chen 42163fd4b0 Merge "bp2build: support genrule $(location) and $(locations)" am: 801a669566 am: 6d385260fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifed6a266bd897052ab0e08e724953c52d8f16a72
2021-01-26 23:28:04 +00:00
Bob Badour 7bebc6e5f2 Merge "Add license_kinds for CDDL" am: 398ba4fcb7 am: b22e224035
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560129

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cca91f5cb873ca9ea0b231b6783aee130acfc1d
2021-01-26 23:27:53 +00:00
Jingwen Chen 6d385260fd Merge "bp2build: support genrule $(location) and $(locations)" am: 801a669566
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4407dd444c66e5adcd44ac081b28991f35d997bf
2021-01-26 22:54:21 +00:00
Jingwen Chen 801a669566 Merge "bp2build: support genrule $(location) and $(locations)" 2021-01-26 22:30:48 +00:00
Bob Badour b22e224035 Merge "Add license_kinds for CDDL" am: 398ba4fcb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560129

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ea6b63908a010d4e65bc7c67ff9cb0d4f562b5d
2021-01-26 22:26:03 +00:00
Colin Cross f04fe9abca multiproduct_kati: increase ram per job to 25GB
multiproduct_kati sometimes passes 20GB per soong_build process,
increase required ram per job to 25GB.

Bug: 178376498
Test: none
Change-Id: I446f52ea7419bc3015d940511af1f03b15eb651e
2021-01-26 22:09:44 +00:00
Bob Badour 398ba4fcb7 Merge "Add license_kinds for CDDL" 2021-01-26 21:57:35 +00:00
Liz Kammer 5dbd329d88 Merge "Refactor android/paths.go to allow reuse" am: bd52e94cbc am: 9f6be6b766
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1496657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7cac2d29dcd6787f09b9864bbafbc7dd6f40a4a
2021-01-26 21:48:38 +00:00
Liz Kammer 9f6be6b766 Merge "Refactor android/paths.go to allow reuse" am: bd52e94cbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1496657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05aedc7dc65d4bbae07c8c10ff44f8383ff306cb
2021-01-26 21:27:53 +00:00
Ivan Lozano f1014b6d0f Merge "Rust: abort on panic" am: 0e737626fc am: 16f751c248
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id27627398018fbe72633e78ae305559606259360
2021-01-26 20:37:41 +00:00
Liz Kammer bd52e94cbc Merge "Refactor android/paths.go to allow reuse" 2021-01-26 20:35:06 +00:00
Ivan Lozano 16f751c248 Merge "Rust: abort on panic" am: 0e737626fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie34f96d628c77119fcb1c050f063aefd599cab6a
2021-01-26 20:16:53 +00:00
Ivan Lozano 0e737626fc Merge "Rust: abort on panic" 2021-01-26 19:54:33 +00:00
Kousik Kumar 1e4d5f3e67 Add FAILED: prefix to RBE Fatal error message
This error message it currently being
logged to stdout which goes to build.log file . We want it to be logged to
build_error.log file instead so that downstream systems that need to run
based on the error message will continue to work.

Test: Tested by running `m toybox` and ensuring that FAILED: prefix is
at the beginning of the line.

Bug: b/177221705
Change-Id: Ie0c9acee2739acf149384e33804b5fca3273c24f
2021-01-26 14:34:30 -05:00