Commit Graph

6099 Commits

Author SHA1 Message Date
Liz Kammer
c22d6f4f9a Merge "re-add swcodec payload to mixed staging allowlist" am: 0b2cb61010 am: d5522fa784 am: 288e01bb58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2596025

Change-Id: Ic794390b960c238b9d649e5280b133b9c234e3fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:54:38 +00:00
Treehugger Robot
12dc1a34c3 Merge "Revert "Revert "Restrict plugins to an existing allowlist""" into udc-dev-plus-aosp 2023-05-18 14:06:43 +00:00
Liz Kammer
dfe4a9e4dd Revert "Revert "Restrict plugins to an existing allowlist""
This reverts commit b20a12553e.

Reason for revert: Rollforward with fix

soong-ca-certificates-apex was missing from allowlist

Test: verify fixes CI breakages
Change-Id: I00687bd2962dbdaaf55189ca4aa82183264eb8d7
2023-05-18 13:28:23 +00:00
Sam Delmerico
3402c0ad44 re-add swcodec payload to mixed staging allowlist
Bug: 279756270
Test: m
Test: forrest
Change-Id: I3305c1bd9388b326fdecb5d333c07cf653d310d8
2023-05-17 20:49:39 -04:00
Treehugger Robot
44c9b696bf Merge "Revert "Restrict plugins to an existing allowlist"" into udc-dev-plus-aosp 2023-05-18 00:36:39 +00:00
Liz Kammer
b20a12553e Revert "Restrict plugins to an existing allowlist"
This reverts commit 09ddb3a73e.

Reason for revert: breaks branches without vendor

Change-Id: I2de95d7b99e4e5fd3d696f51d5b4d6a68a298365
2023-05-17 22:51:43 +00:00
Treehugger Robot
f404959839 Merge "Allowlist libservices" am: a2244043ea am: 2059260546 am: 5215be2668
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2578570

Change-Id: Id20587d9f7365cf690af3bcf8f367c357ab9c040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:56:58 +00:00
Treehugger Robot
a2244043ea Merge "Allowlist libservices" 2023-05-17 17:51:05 +00:00
Treehugger Robot
9267a344be Merge "Restrict plugins to an existing allowlist" into udc-dev-plus-aosp 2023-05-17 15:44:58 +00:00
Treehugger Robot
bd5d4d6344 Merge changes from topic "adbd_host" am: 3daa129afa am: b7b7d08cae am: 65e399391a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2590206

Change-Id: I39652bb7287179facbcb3d3d87e46fb0d4e221e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 08:13:22 +00:00
Treehugger Robot
3daa129afa Merge changes from topic "adbd_host"
* changes:
  Allowlist python dependency of adb targets
  bp2build support for host_ldlibs
2023-05-17 05:23:21 +00:00
Spandan Das
2c24785d5e Merge "Allowlist aidl" am: 9aa6a49ca1 am: 7a4cbb792e am: 6922c4080c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2585326

Change-Id: Icaf86b6dff9e45c1954c333b3f5cc323855654f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 01:43:25 +00:00
Spandan Das
b3d5c48cad Allowlist python dependency of adb targets
Bug: 216626461
Test: TH
Change-Id: I4f16ce0037dd7afdf194e210ce63bfc60bd73cc1
2023-05-16 22:44:52 +00:00
Spandan Das
9aa6a49ca1 Merge "Allowlist aidl" 2023-05-16 22:30:23 +00:00
Vinh Tran
320aecfbc8 Allowlist libservices
Test: CI
Change-Id: I6e7a969228ca491344520bba0d66159d5060e996
2023-05-16 16:08:28 -04:00
Joe Onorato
bafd3b5ed7 Merge "Aconfig rules" am: 9f96a17653 am: 00ac60a7cd am: 108699f636
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2583151

Change-Id: I8b435f7a7f1c53a6dc927f73451dadc5d04e291f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:02:18 +00:00
Joe Onorato
9f96a17653 Merge "Aconfig rules" 2023-05-16 02:49:46 +00:00
Jingwen Chen
da8578a4e5 Merge "Move disable downloads to bazelrc from mixed build" am: be981e5e07 am: d76c9d2e96 am: bf33c0e816
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515275

Change-Id: I021917db6f66e35d2d4cf8f75b6f192d5766b36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 00:39:54 +00:00
Jingwen Chen
be981e5e07 Merge "Move disable downloads to bazelrc from mixed build" 2023-05-15 22:50:13 +00:00
Joe Onorato
fee845a737 Aconfig rules
Test: m services_device_config (which runs sooong tests too)
Change-Id: I432e914d01d2bff77ba68de65ae5baea527090f5
2023-05-13 11:32:25 -07:00
Liz Kammer
33b6a7c417 Merge "Clear out allowlist to get CI green" am: 197fd16582 am: 60d9f95150 am: 97d382932a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2586788

Change-Id: I2b3e40b51b9a53a0dc1c7c7004775df58d7c9a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:35:10 +00:00
Liz Kammer
9b268a9cbc Merge "Add missing package to allowlist" am: a9af43e37b am: a368f41fe4 am: bd2046e823
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2586787

Change-Id: I0b3114e5c1930ca10be54ac620b0bb183699454e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:34:45 +00:00
Liz Kammer
197fd16582 Merge "Clear out allowlist to get CI green" 2023-05-12 14:29:12 +00:00
Liz Kammer
3c226ffbd2 Clear out allowlist to get CI green
Test: 282042844
Change-Id: I9437b9c08402e913a0a6ee9c6ed453332fe04fa9
2023-05-12 08:49:54 -04:00
Liz Kammer
e7a4712ec9 Add missing package to allowlist
Test: CI
Change-Id: I15b95dd8a0acbde89f0a9f2033d8ea9c904b65fc
2023-05-12 08:44:51 -04:00
Jingwen Chen
379221f086 Move disable downloads to bazelrc from mixed build
Keeps mixed builds and b consistent.

Bug: 275724420
Test: presubmits, especially bp2build-incremental
Change-Id: I89942111f259bf9a88c27e124adbdb73936c514c
2023-05-11 13:30:59 -04:00
Spandan Das
ebbea2a8c9 Allowlist aidl
Test: b build //system/tools/aidl

Change-Id: I3ddca72343822acf0a3d581061b32a37da6e1790
2023-05-11 01:12:03 +00:00
Cole Faust
6234e1ff39 Merge "Bp2build support for soong config variables + os" am: 069812158f am: 60fff115b1 am: 89aed7bcb4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2576792

Change-Id: Id667f635b6294f14412441a42cb1aac51d6d751e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:43:55 +00:00
Cole Faust
069812158f Merge "Bp2build support for soong config variables + os" 2023-05-10 21:28:02 +00:00
Romain Jobredeaux
8931fb1ba8 Merge "Map prebuilt_apis labels to Bazel's manually generated ones." am: ea48fdc6f8 am: bf315824ea am: 70a3c94895
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2582551

Change-Id: If3666ba362a5cf03535177dc21940d26bd92661e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:42:18 +00:00
Treehugger Robot
8624fe96c7 Merge "Change bp2build converter of module "package"." am: f47760461c am: 85524d529d am: 1f83bd2a0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2580791

Change-Id: I16e7096f582e2a74725b026cfc55fcd83237335c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:37:24 +00:00
Romain Jobredeaux
ea48fdc6f8 Merge "Map prebuilt_apis labels to Bazel's manually generated ones." 2023-05-10 18:23:51 +00:00
Treehugger Robot
f47760461c Merge "Change bp2build converter of module "package"." 2023-05-10 17:38:19 +00:00
Wei Li
2c9e8d6128 Change bp2build converter of module "package".
1) Use attribute name "default_package_metadata" instead of
   "default_applicable_licenses" in packages to better describe its use.
2) Add a filegroup "default_metadata_file" in packages to search for
   METADATA file in each package.
3) Include "default_metadata_file" in each package's
   "default_package_metadata" attribute.

Bug: 275472038
Test: CIs
Change-Id: I645c013c39e3190fd96c4a549d39a331aced16bd
2023-05-09 17:37:04 -07:00
Jiakai Zhang
a44f099436 Merge changes from topic "revert-2580631-revert-2574032-XXTWCJDTDQ-YJWXHQZNPJ" am: 90c69f71c4 am: 7372e9d3f6 am: dc45b067aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2582191

Change-Id: I419bfa20610eaba2fcbd0112983d82113d07cc2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 15:55:57 +00:00
Cole Faust
150f9a5a63 Bp2build support for soong config variables + os
For converting the art plugins to pure soong, it would be useful to
have a property that's qualified on both a soong config variable and
the OS. Soong had very little-known support for this by saying your
soong config variable changes the "target.android.cflags" property,
and we didn't supporting bp2building that. Add the bp2build support.

This cl also refactors product variable and soong variable bp2building
so that they're separate from each other, which I think makes the code
easier to understand.

Test: go test
Change-Id: Ic74dc75da8103fa2523da95c3560c9ce3c5e5672
2023-05-08 17:50:06 -07:00
Jiakai Zhang
cf61e3c591 Revert^2 "Generate app profiles even if dexpreopt is disabled."
Revert submission 2580631-revert-2574032-XXTWCJDTDQ

Reason for revert: Fixed build breakages

Reverted changes: /q/submissionid:2580631-revert-2574032-XXTWCJDTDQ

Bug: 280440941
Test: lunch aosp_cf_riscv64_minidroid-userdebug && m UNSAFE_DISABLE_HIDDENAPI_FLAGS=true dist
Test: Disable dex2oat on host (to simulate macOS) and build
Change-Id: I6090b4b74cedb6d129fcbeef58d075c8ccdcc4e2
2023-05-08 21:29:23 +01:00
Romain Jobredeaux
8242b43df8 Map prebuilt_apis labels to Bazel's manually generated ones.
Change-Id: I5bec807da9b39e2b166af1bd83da43df91f997ef
Bug: 237810289
Test: check that android-non-updatable.stubs.module_lib uses manual
bazel target for its sdk_system_current_android dependency

Change-Id: I6f5fb348e1dcaad10eb756382359f34de792b6e0
2023-05-08 15:26:43 -04:00
Treehugger Robot
1b361b6931 Merge "Prebuilt replacing source should not change partition" am: 7ef8d46640 am: 34d8436fb5 am: 94b225938b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2574171

Change-Id: Iec29e97a96b1425418067155ca5576c9e4e95138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:51:53 +00:00
Treehugger Robot
7ef8d46640 Merge "Prebuilt replacing source should not change partition" 2023-05-08 05:40:40 +00:00
Wei Li
697d6acede Merge "Export some make variables to Bazel through product variables." am: 773e098dfd am: a8afca7f73 am: 25ce8ad6eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2577812

Change-Id: I16b45b45c593d349124a9bae2bbdfb7ff613e71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 18:50:45 +00:00
Qiao Yang
bfbdde8f05 Merge changes from topic "revert-2574032-XXTWCJDTDQ" am: 7081aaf874 am: f5b8864109 am: e7d86110d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2580631

Change-Id: Ibb066f7ec668deae624dcde79e4b0461aea0e2ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 18:50:03 +00:00
Wei Li
773e098dfd Merge "Export some make variables to Bazel through product variables." 2023-05-05 17:32:20 +00:00
Qiao Yang
7081aaf874 Merge changes from topic "revert-2574032-XXTWCJDTDQ"
* changes:
  Revert "Generate boot image profiles even if dexpreopt is disabled."
  Revert "Generate app profiles even if dexpreopt is disabled."
2023-05-05 16:43:45 +00:00
Qiao Yang
3d08c388b9 Revert "Generate app profiles even if dexpreopt is disabled."
Revert submission 2574032

Reason for revert: DroidMonitor-triggered revert due to breakage <https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_riscv64_minidroid-userdebug&lkgb=10069333&lkbb=10075041&fkbb=10071083>, bug <b/280902279>

Reverted changes: /q/submissionid:2574032

Change-Id: Ia9d05f3b7439604eb4a4b4100f46879fe11f5820
BUG: <280902279>
2023-05-05 15:03:24 +00:00
Wei Li
c642d688d6 Export some make variables to Bazel through product variables.
Bug: 275472038
Test: CIs
Change-Id: I4fdd0f989d75045644e8f2e32d1eb77543a3b9f3
2023-05-04 23:08:45 -07:00
Yu Liu
acac9b4dcc Merge "Remove the codec2 hidl libs from mixed build" am: bab5b9d76a am: 7349931eb9 am: 614cfca35b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2580151

Change-Id: I7b99d18e814253730113f0e70852c08127fb75e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 01:26:39 +00:00
Jiakai Zhang
585b3d55b2 Merge changes I4e721b47,I1bf05ade am: dbfcf85c53 am: 908776467d am: 5ee0b6950f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2574032

Change-Id: Ib901e4213a44911de41b9af5c008f7ebc213a0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:21:24 +00:00
Yu Liu
bab5b9d76a Merge "Remove the codec2 hidl libs from mixed build" 2023-05-05 00:05:26 +00:00
Jiakai Zhang
dbfcf85c53 Merge changes I4e721b47,I1bf05ade
* changes:
  Generate app profiles even if dexpreopt is disabled.
  Generate boot image profiles even if dexpreopt is disabled.
2023-05-04 22:13:08 +00:00