Commit Graph

52538 Commits

Author SHA1 Message Date
Treehugger Robot
6f15d34c58 Merge "Dedup logic for selecting system modules" am: 9f76be59f1 am: 13b567905a am: 43b4dda231 am: 3474100b45 am: 58aa38196b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880030

Change-Id: I06992575bcde80f5fdcdd418fd811a7c20305fd8
2021-11-04 12:59:55 +00:00
Treehugger Robot
58aa38196b Merge "Dedup logic for selecting system modules" am: 9f76be59f1 am: 13b567905a am: 43b4dda231 am: 3474100b45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880030

Change-Id: Ia5c1fdae38a14b16ca451de81b0e87d07e558bf1
2021-11-04 12:47:40 +00:00
Treehugger Robot
3474100b45 Merge "Dedup logic for selecting system modules" am: 9f76be59f1 am: 13b567905a am: 43b4dda231
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880030

Change-Id: I7767011ebf718ce2172786a2ad0813e67457ac80
2021-11-04 12:19:53 +00:00
Treehugger Robot
43b4dda231 Merge "Dedup logic for selecting system modules" am: 9f76be59f1 am: 13b567905a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880030

Change-Id: Ibe9dbeadaf0a03a88146182a951260a59c8c4ce7
2021-11-04 12:02:38 +00:00
Treehugger Robot
13b567905a Merge "Dedup logic for selecting system modules" am: 9f76be59f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880030

Change-Id: I38976dd90a86313150bf4027dc3cdc1eec49343d
2021-11-04 11:49:34 +00:00
Treehugger Robot
9f76be59f1 Merge "Dedup logic for selecting system modules" 2021-11-04 11:35:25 +00:00
Paul Duffin
5de9a78365 Merge "Rename core-current-stubs-system-modules to be more consistent" am: 9de51af72c am: 9cf5708c2c am: e7087fd0b4 am: f975b088aa am: e050f310c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880029

Change-Id: I6eb0529d4f3f05cb502e64545357d0b497fa8246
2021-11-03 20:16:53 +00:00
Treehugger Robot
23a645427d Merge "Convert .meta_lic files to textproto" am: c37663aad9 am: f447825a3e am: c17562e703 am: fbc04ca616 am: d75e0632ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1866113

Change-Id: I573154d08e4a6778c1a5603e1ded7e009219cab7
2021-11-03 20:15:33 +00:00
Paul Duffin
e050f310c7 Merge "Rename core-current-stubs-system-modules to be more consistent" am: 9de51af72c am: 9cf5708c2c am: e7087fd0b4 am: f975b088aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880029

Change-Id: Id578ce60d8b6a8b2149bc4f6822ed161f6eb2b47
2021-11-03 19:49:51 +00:00
Treehugger Robot
d75e0632ce Merge "Convert .meta_lic files to textproto" am: c37663aad9 am: f447825a3e am: c17562e703 am: fbc04ca616
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1866113

Change-Id: Ia0e621b1c8a52f290f8937c118edf0fa5e5155ad
2021-11-03 19:49:39 +00:00
Paul Duffin
f975b088aa Merge "Rename core-current-stubs-system-modules to be more consistent" am: 9de51af72c am: 9cf5708c2c am: e7087fd0b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880029

Change-Id: I8df9a0b898353dcd0875df97d98b18cb1e3e8a92
2021-11-03 19:32:49 +00:00
Treehugger Robot
fbc04ca616 Merge "Convert .meta_lic files to textproto" am: c37663aad9 am: f447825a3e am: c17562e703
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1866113

Change-Id: Ia6e816af876bc4732493cfd983a665a16a7890cb
2021-11-03 19:32:38 +00:00
Paul Duffin
e7087fd0b4 Merge "Rename core-current-stubs-system-modules to be more consistent" am: 9de51af72c am: 9cf5708c2c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880029

Change-Id: I498c06cc77c6b926979af19bbf404c9d0d629cb8
2021-11-03 19:13:59 +00:00
Treehugger Robot
c17562e703 Merge "Convert .meta_lic files to textproto" am: c37663aad9 am: f447825a3e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1866113

Change-Id: I3810dd8ed0848e3e0d2f4b72f6881668b42182b7
2021-11-03 19:13:49 +00:00
Paul Duffin
9cf5708c2c Merge "Rename core-current-stubs-system-modules to be more consistent" am: 9de51af72c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880029

Change-Id: Ib962470b0a50d5efd781b26d1b24f719cb5e1396
2021-11-03 18:47:39 +00:00
Treehugger Robot
f447825a3e Merge "Convert .meta_lic files to textproto" am: c37663aad9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1866113

Change-Id: I689b2ed80cc5a8477e3884fe5bb2a15af1b1711e
2021-11-03 18:47:10 +00:00
Paul Duffin
e5ad90c37b Dedup logic for selecting system modules
Previously, the selection of system modules was duplicated, once for
source and once for prebuilts. This change dedups that by switching the
source code to use the same mechanism as the prebuilts which will ensure
consistent behavior in future.

Bug: 204189791
Test: m	nothing
Change-Id: Ia1729017ae332181c95f7b205dab87fb47d43fb8
2021-11-03 18:44:45 +00:00
Paul Duffin
9de51af72c Merge "Rename core-current-stubs-system-modules to be more consistent" 2021-11-03 18:43:50 +00:00
Treehugger Robot
c37663aad9 Merge "Convert .meta_lic files to textproto" 2021-11-03 18:31:02 +00:00
Treehugger Robot
3a71307cd8 Merge changes Id11f4fb1,Id573d970,Ia94a0b5c am: a3bd963988 am: 62539c2872 am: 3fe1cc8006 am: e681a108f9 am: 948e460567
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878086

Change-Id: Ib71c32684d955f06e3163cc222fea8c4fa7c838e
2021-11-03 17:06:11 +00:00
Paul Duffin
3538bde75b Merge "Use module-lib system modules when building from prebuilts" am: 8380ee66a5 am: f7b8ad3546 am: 9bde48822f am: d3a64c082c am: 101809dbec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877320

Change-Id: I09dba9507e98a9207a2cc8b57687d293eecf0cca
2021-11-03 17:05:59 +00:00
Paul Duffin
10fb76f467 Rename core-current-stubs-system-modules to be more consistent
Renames to core-public-stubs-system-modules so that it is of the format
core-<sdk-kind>-stubs-system-modules.

Bug: 204189791
Test: m nothing
Change-Id: Iac565c940c2ef92be9cc64c0c6b8102a26afe0dd
2021-11-03 16:58:29 +00:00
Treehugger Robot
948e460567 Merge changes Id11f4fb1,Id573d970,Ia94a0b5c am: a3bd963988 am: 62539c2872 am: 3fe1cc8006 am: e681a108f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878086

Change-Id: I460510263d1aaeb53b730b25389940fec0b96205
2021-11-03 16:48:48 +00:00
Paul Duffin
101809dbec Merge "Use module-lib system modules when building from prebuilts" am: 8380ee66a5 am: f7b8ad3546 am: 9bde48822f am: d3a64c082c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877320

Change-Id: I9481b3823cacf08799d977b7f3bd9a0999823e8a
2021-11-03 16:48:40 +00:00
Treehugger Robot
e681a108f9 Merge changes Id11f4fb1,Id573d970,Ia94a0b5c am: a3bd963988 am: 62539c2872 am: 3fe1cc8006
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878086

Change-Id: I38b6e47cf416f1adcf9e2f3b9f996d53c85df409
2021-11-03 16:30:43 +00:00
Paul Duffin
d3a64c082c Merge "Use module-lib system modules when building from prebuilts" am: 8380ee66a5 am: f7b8ad3546 am: 9bde48822f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877320

Change-Id: I3e316f05647710ffe8c26c6bb9c7ee435dd49bf3
2021-11-03 16:30:35 +00:00
Treehugger Robot
3fe1cc8006 Merge changes Id11f4fb1,Id573d970,Ia94a0b5c am: a3bd963988 am: 62539c2872
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878086

Change-Id: I0d4b5db7383905d57f343a209edd7198511ee9c7
2021-11-03 16:13:02 +00:00
Paul Duffin
9bde48822f Merge "Use module-lib system modules when building from prebuilts" am: 8380ee66a5 am: f7b8ad3546
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877320

Change-Id: I62e3728458500ce6caa5930a95e5eb2cb749fe07
2021-11-03 16:12:57 +00:00
Treehugger Robot
62539c2872 Merge changes Id11f4fb1,Id573d970,Ia94a0b5c am: a3bd963988
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878086

Change-Id: Ia4ae8723342e8114b25326c5259065be32d32c58
2021-11-03 15:52:54 +00:00
Paul Duffin
f7b8ad3546 Merge "Use module-lib system modules when building from prebuilts" am: 8380ee66a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877320

Change-Id: I8af375d9536c11912ed31bf589a6c8990d072c16
2021-11-03 15:52:46 +00:00
Treehugger Robot
a3bd963988 Merge changes Id11f4fb1,Id573d970,Ia94a0b5c
* changes:
  Fix //conditions:default excludes computation for LabelListAttribute.
  bp2build: split Bazel conversion context into smaller ones, and change TopDownMutatorContext signatures to use Bazel conversion context.
  Add an error check in `bazelPackage` for malformed labels.
2021-11-03 15:36:28 +00:00
Liz Kammer
83bdf7d0d1 Merge "Update bp2build denylist cause" am: 5506c1658c am: ae5a9f4d14 am: 1476238b34 am: a7479d0376 am: cad47b9b82
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878026

Change-Id: I74a1cbffbad8b70706560db137fe3310a8547395
2021-11-03 15:33:31 +00:00
Paul Duffin
8380ee66a5 Merge "Use module-lib system modules when building from prebuilts" 2021-11-03 15:32:42 +00:00
Liz Kammer
cad47b9b82 Merge "Update bp2build denylist cause" am: 5506c1658c am: ae5a9f4d14 am: 1476238b34 am: a7479d0376
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878026

Change-Id: I9c89f90e90bee43a32e0d5c758bb05d0adae3917
2021-11-03 15:12:13 +00:00
Liz Kammer
a7479d0376 Merge "Update bp2build denylist cause" am: 5506c1658c am: ae5a9f4d14 am: 1476238b34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878026

Change-Id: I29c0c96d54bd2f9324c17b55197a39d4012e2147
2021-11-03 14:56:40 +00:00
Liz Kammer
1476238b34 Merge "Update bp2build denylist cause" am: 5506c1658c am: ae5a9f4d14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878026

Change-Id: I5e8ec020332eef9c862e6aab7dafd1d26d2cb221
2021-11-03 14:46:08 +00:00
Liz Kammer
ae5a9f4d14 Merge "Update bp2build denylist cause" am: 5506c1658c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878026

Change-Id: If2e448bcbdfdad76b8c2103a480b12d166a25b7f
2021-11-03 14:34:21 +00:00
Liz Kammer
5506c1658c Merge "Update bp2build denylist cause" 2021-11-03 14:19:16 +00:00
Treehugger Robot
4a3a8e7469 Merge "Revert "Fix python_binary_host module in mixed build."" am: ed078675d0 am: fbf70371b2 am: a9f0781bce am: 6f1adaef23 am: 386ca5b484
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879357

Change-Id: I40038cf67990127ad19be3d28f787dfba74bf9e9
2021-11-03 12:18:06 +00:00
Treehugger Robot
386ca5b484 Merge "Revert "Fix python_binary_host module in mixed build."" am: ed078675d0 am: fbf70371b2 am: a9f0781bce am: 6f1adaef23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879357

Change-Id: I4801878835fd34030db63a54e8aac28a61b79454
2021-11-03 12:00:05 +00:00
Treehugger Robot
6f1adaef23 Merge "Revert "Fix python_binary_host module in mixed build."" am: ed078675d0 am: fbf70371b2 am: a9f0781bce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879357

Change-Id: I2970f72cc607adc885e2966c5d2475e84065741c
2021-11-03 11:48:31 +00:00
Treehugger Robot
a9f0781bce Merge "Revert "Fix python_binary_host module in mixed build."" am: ed078675d0 am: fbf70371b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879357

Change-Id: I1a7c48950326d56f4c2194950971c61f172e188c
2021-11-03 11:30:54 +00:00
Treehugger Robot
fbf70371b2 Merge "Revert "Fix python_binary_host module in mixed build."" am: ed078675d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879357

Change-Id: Ie91b6ee18f09c954e650f8a2e054a590d851a5c1
2021-11-03 11:19:18 +00:00
Treehugger Robot
ed078675d0 Merge "Revert "Fix python_binary_host module in mixed build."" 2021-11-03 11:05:58 +00:00
Rupert Shuttleworth
ffc4cc41a3 Revert "Fix python_binary_host module in mixed build."
Revert submission 1861755-fix_python_binary_host_in_mixed_build

Reason for revert: Broke Bazel CI, please see https://android-build.googleplex.com/builds/submitted/7879108/mixed_droid-clean/latest/view/logs/build_error.log and https://android-build.googleplex.com/builds/submitted/7879108/mixed_droid-incremental/latest/view/logs/build_error.log
Reverted Changes:
Ica457ee71:Add platform needed by python_binary_host.
Ibc8b99a92:Fix python_binary_host module in mixed build.

Change-Id: I3d6c4f6edee2d00bdc78efd5cee64f4c915baeaa
2021-11-03 09:07:26 +00:00
Lukács T. Berki
2aa4e93c14 Merge "Update debugging instructions." am: c2fc91e52b am: 64578d5b13 am: 2e7bc8ddec am: 5a639e27d8 am: 0bf511f7dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841374

Change-Id: I889ae20de20602ea253b913580eba3f724b785cb
2021-11-03 09:03:04 +00:00
Lukács T. Berki
0bf511f7dd Merge "Update debugging instructions." am: c2fc91e52b am: 64578d5b13 am: 2e7bc8ddec am: 5a639e27d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841374

Change-Id: Idb8e8ed0c1b45c9696fb557f257db54a0d7e698f
2021-11-03 08:50:40 +00:00
Lukács T. Berki
5a639e27d8 Merge "Update debugging instructions." am: c2fc91e52b am: 64578d5b13 am: 2e7bc8ddec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841374

Change-Id: Ic8d610948711f78d2297080ca0c1359c1a40e84f
2021-11-03 08:33:46 +00:00
Lukács T. Berki
2e7bc8ddec Merge "Update debugging instructions." am: c2fc91e52b am: 64578d5b13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841374

Change-Id: I493c87bce2787a15bb8e29536ab662da60113778
2021-11-03 08:15:25 +00:00
Lukács T. Berki
64578d5b13 Merge "Update debugging instructions." am: c2fc91e52b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841374

Change-Id: I62fa4a63cb0ceef8eff68ae80d5edfbb7729bf6f
2021-11-03 08:03:51 +00:00