Commit Graph

34149 Commits

Author SHA1 Message Date
Colin Cross
93ff702df2 Don't build automatic RROs for tests
Automatic RROs don't make sense for tests, the tests can't rely on
overlays being installed on product or vendor.  Creating the RROs
causes a race during builds that build both droid and device-tests
goals, as the RROs may be installed to the vendor directory as a
dependency of the device-tests goal before or after the vendor image
is packaged as a dependency of the droid goal.  If the RROs are
installed first and the vendor image is low on space it may result
in an out-of-space error.

Bug: 282885159
Test: Rule to build $OUT/vendor/overlay/SystemUITests__*__auto_generated_rro_vendor.apk no longer exists
Change-Id: I760355ffb1818e91c02a98473312f9f21c149361
Merged-In: I760355ffb1818e91c02a98473312f9f21c149361
2023-05-18 03:14:01 +00:00
Colin Cross
ede2d8e2ec Merge "Build java fuzz targets with one build target instead of needed a host target and device" 2023-05-18 02:51:43 +00:00
Treehugger Robot
9412209acb Merge "Don't build automatic RROs for tests" into udc-dev am: d6286eefa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23288488

Change-Id: Ic0f314886148c7cbea9cf24d10d55430e10ff357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 23:18:19 +00:00
Wei Li
c2dd3fd0a0 Merge "Some changes to support SBOM generation for b build unbundled APEXs." am: eb035dc89f am: 802310c4fd am: 1f8974d7b5
Original change: https://android-review.googlesource.com/c/platform/build/+/2585677

Change-Id: Id9060cf165fea3d684fc03eba4957e5517844b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 21:03:43 +00:00
Wei Li
1f8974d7b5 Merge "Some changes to support SBOM generation for b build unbundled APEXs." am: eb035dc89f am: 802310c4fd
Original change: https://android-review.googlesource.com/c/platform/build/+/2585677

Change-Id: I2dd20a7a04cafccdbc64b0ebdedf71d49867b5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:20:08 +00:00
Jiakai Zhang
0f49bc7d1a Move CLC construction to Ninja phase.
Bug: 282877248
Test: m
Change-Id: Ib87aafcfad09b569e44eed3a5a6c385237a66b55
2023-05-17 21:06:32 +01:00
Wei Li
802310c4fd Merge "Some changes to support SBOM generation for b build unbundled APEXs." am: eb035dc89f
Original change: https://android-review.googlesource.com/c/platform/build/+/2585677

Change-Id: I0f302bf5cf4e6313aedc836034ccd9111f4ec534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:33:20 +00:00
Wei Li
eb035dc89f Merge "Some changes to support SBOM generation for b build unbundled APEXs." 2023-05-17 19:19:47 +00:00
Cory Barker
4b0112209b Build java fuzz targets with one build target instead of needed a host target and device
(cherry picked from commit 12727fceab)

Test: built locally and verified fuzzers with Jazzer
Change-Id: Icb1ecef1920fa1ba6d4492acdd3b37093964eb84
2023-05-17 19:06:26 +00:00
Colin Cross
2e55115ab3 Don't build automatic RROs for tests
Automatic RROs don't make sense for tests, the tests can't rely on
overlays being installed on product or vendor.  Creating the RROs
causes a race during builds that build both droid and device-tests
goals, as the RROs may be installed to the vendor directory as a
dependency of the device-tests goal before or after the vendor image
is packaged as a dependency of the droid goal.  If the RROs are
installed first and the vendor image is low on space it may result
in an out-of-space error.

Bug: 282885159
Test: Rule to build $OUT/vendor/overlay/SystemUITests__*__auto_generated_rro_vendor.apk no longer exists
Ignore-AOSP-First: high priority build fix
Change-Id: I760355ffb1818e91c02a98473312f9f21c149361
2023-05-17 11:01:19 -07:00
Treehugger Robot
4ba88037d8 Merge "Add BUILD_BROKEN_PLUGIN_VALIDATION flag" into udc-dev-plus-aosp 2023-05-17 15:44:58 +00:00
Liz Kammer
f24be9dba9 Add BUILD_BROKEN_PLUGIN_VALIDATION flag
Use is to specify the list of plugins are are not allowed.

Ignore-AOSP-First: Requires an internal only change to not break when submitted
Test: CI
Change-Id: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
2023-05-17 15:44:25 +00:00
Anton Hansson
68af924f54 Don't add build ID to version name
There is no clear reason why this should be done, and there is evidence
of it causing confusion & minor problems.

Bug: 186432595
Test: m nothing & grep AppsDefaultVersionName out/soong/soong.variables
Change-Id: I46243b4cfb3b23f2229bc1275c6ee96c1cee01d3
2023-05-17 09:19:11 +00:00
SzuWei Lin
fb27c2954f Support dynamic 64-bit drmserver
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER
to put drmserver_dynamic.rc into GSI. Which starts 64-bit
drmserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit drmserver.

Bug: 282603373
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0
Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0
2023-05-17 05:02:25 +00:00
Steve Berbary
e4783d4b7a Update Security String to 2023-07-05 am: d6c119bfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Change-Id: I32253c6815cc77d3c1a5dea63bde576a8deb900c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 01:21:05 +00:00
Treehugger Robot
bc9c36aaf0 Merge "Note ability to annotate dependencies." am: 787629c95d am: 4e5532a5a1 am: 97fc4f8ce6
Original change: https://android-review.googlesource.com/c/platform/build/+/2592248

Change-Id: Iea9eac3928926fde9459134781e5905071d0dc85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:20:10 +00:00
Treehugger Robot
ac7c99f04c Merge "Strip values of soong_config_set calls" am: e5e5642ba5 am: f739318a1a am: a46b724fa1
Original change: https://android-review.googlesource.com/c/platform/build/+/2592246

Change-Id: Id9220bc40ab4d2f08b9b3acc4f9b46f232f02db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:19:41 +00:00
Treehugger Robot
81d587d74c Merge changes from topic "presubmit-am-375c1d3fc5004c749afee2b2beeeaaa6" into tm-qpr-dev-plus-aosp
* changes:
  [automerge] Update Security String to 2023-07-05 2p: 4fd6e8777b
  Update Security String to 2023-07-05
2023-05-16 23:57:02 +00:00
Treehugger Robot
dbe4d186fe Merge changes from topic "presubmit-am-375c1d3fc5004c749afee2b2beeeaaa6" into udc-dev-plus-aosp
* changes:
  [automerge] Update Security String to 2023-07-05 2p: 4fd6e8777b 2p: 39c2792c7a
  [automerge] Update Security String to 2023-07-05 2p: 4fd6e8777b
  Update Security String to 2023-07-05
2023-05-16 23:57:02 +00:00
Treehugger Robot
4e5532a5a1 Merge "Note ability to annotate dependencies." am: 787629c95d
Original change: https://android-review.googlesource.com/c/platform/build/+/2592248

Change-Id: I751f21b8c1ebe478ec18a053c2fb131c24f693c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 22:55:26 +00:00
Cole Faust
c113a70221 Define release flags in starlark instead of make
So that we have a more restricted enviornment for this new configuration
axis that can also be imported into other tools more easily.

Test: Manually
Change-Id: Iabce1919f6d6f57a256ae144784af7c47622b54d
2023-05-16 15:46:55 -07:00
Treehugger Robot
787629c95d Merge "Note ability to annotate dependencies." 2023-05-16 22:34:02 +00:00
Treehugger Robot
f739318a1a Merge "Strip values of soong_config_set calls" am: e5e5642ba5
Original change: https://android-review.googlesource.com/c/platform/build/+/2592246

Change-Id: I72bafd788fbffee43c6a09637ef8f73e20c63a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 22:32:51 +00:00
Cole Faust
76c2fcb90e Strip values of soong_config_set calls
It's a common mistake in make to have leading/trailing whitespace
on values, so strip it out before assigning to variables.

Bug: 282824346
Test: Presubmits
Change-Id: If4d3b86795c05ba32006af3af8031ca083a4c54b
2023-05-16 10:53:05 -07:00
Bob Badour
2191b9db82 Note ability to annotate dependencies.
Test: m droid dist
Change-Id: If3a0d032caf7801196117d7c4d4d21cb67c826bf
2023-05-16 10:52:12 -07:00
Joe Onorato
e0677217e7 Merge "Add aconfig rules" am: 7f1171e493 am: 2c3f4f5507 am: 1cca6c054b
Original change: https://android-review.googlesource.com/c/platform/build/+/2583250

Change-Id: I79d6bfe0af746d1cfc9df51325c85e3ee3cbb9ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:02:17 +00:00
Joe Onorato
2c3f4f5507 Merge "Add aconfig rules" am: 7f1171e493
Original change: https://android-review.googlesource.com/c/platform/build/+/2583250

Change-Id: Ic258d2dd4320d5cfe809e1debfc991c38643d4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 03:32:45 +00:00
Joe Onorato
7f1171e493 Merge "Add aconfig rules" 2023-05-16 02:49:45 +00:00
Treehugger Robot
b22f49ba48 Merge "Add merge_ota to otatools" am: 1da7ff838b am: 899fc1b715 am: d478626f89
Original change: https://android-review.googlesource.com/c/platform/build/+/2587126

Change-Id: I1014285c3c27c49cf782e9531d6b8b3ca7c2f6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 23:37:22 +00:00
Treehugger Robot
89bb2a6b19 Merge "Add support for packaging modules.load.charger into vendor_[kernel_]boot" am: d28f557324 am: 58c919b54a am: 4f9901cb66
Original change: https://android-review.googlesource.com/c/platform/build/+/2559650

Change-Id: I291de565a172a67c7b671a593e810741c0558ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 23:37:13 +00:00
Treehugger Robot
cb424db193 Merge "Remove gpl_source.tgz" am: 48a8afe677 am: 0d73e67d39 am: b3d5d43b15
Original change: https://android-review.googlesource.com/c/platform/build/+/2584219

Change-Id: Ic20b2515ee2f3c81d9a80827f6fb1bd0d9bf6e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 23:36:59 +00:00
Treehugger Robot
899fc1b715 Merge "Add merge_ota to otatools" am: 1da7ff838b
Original change: https://android-review.googlesource.com/c/platform/build/+/2587126

Change-Id: I1348aed1dbae5002122612f6bb03c97fbcad9275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 22:53:45 +00:00
Treehugger Robot
58c919b54a Merge "Add support for packaging modules.load.charger into vendor_[kernel_]boot" am: d28f557324
Original change: https://android-review.googlesource.com/c/platform/build/+/2559650

Change-Id: I7e6ed966518efe741d869ca30ae79237729306bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 22:53:16 +00:00
Treehugger Robot
1da7ff838b Merge "Add merge_ota to otatools" 2023-05-15 22:52:50 +00:00
Joe Onorato
0d1a98106a Add aconfig rules
Test: treehugger
Change-Id: I456f87894926287a91d42e738016ca8052cd5039
2023-05-15 15:38:49 -07:00
Treehugger Robot
d28f557324 Merge "Add support for packaging modules.load.charger into vendor_[kernel_]boot" 2023-05-15 22:24:11 +00:00
Treehugger Robot
0d73e67d39 Merge "Remove gpl_source.tgz" am: 48a8afe677
Original change: https://android-review.googlesource.com/c/platform/build/+/2584219

Change-Id: I9db9146283f4775281a1c049c1f15a17f74d818d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 22:10:55 +00:00
Treehugger Robot
48a8afe677 Merge "Remove gpl_source.tgz" 2023-05-15 21:36:32 +00:00
Satoshi Futenma
6d56d45f96 Add merge_ota to otatools
Bug: 282189563
Test: manual, m otatools-package, confirm that merga_ota is
    present in otatools.zip
Change-Id: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
2023-05-15 09:06:02 +02:00
Kiyoung Kim
d1aa1cdf44 Rename soong.variable with target product
Bug: 277029044
Test: build succeeded and checked if out/soong/soong.variable has been
renamed

Change-Id: I035a52f3d8ad80d9e44a55e10fe537556ddecda8
2023-05-14 11:57:16 +00:00
Steve Berbary
ef23512feb [automerge] Update Security String to 2023-07-05 2p: 4fd6e8777b 2p: 39c2792c7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Bug: 282371465
Change-Id: I7128e082a505c0748b579dc775bfa1628effb3ec
2023-05-13 22:22:41 +00:00
Steve Berbary
39c2792c7a [automerge] Update Security String to 2023-07-05 2p: 4fd6e8777b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Bug: 282371465
Change-Id: I65abe1a7045cfef8bcb3dfd454a168aef7e73471
2023-05-13 22:22:32 +00:00
Steve Berbary
d6c119bfaa Update Security String to 2023-07-05
Bug: 282371465
Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
2023-05-13 22:22:23 +00:00
Treehugger Robot
dba7b2e967 Merge "Only search for test suite jdk files once" am: 6961b14269 am: e72f71968a am: 7de4d04c10
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I1dd51d6b64e045fa2a6a38432c70357cfec9539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 07:49:20 +00:00
Treehugger Robot
e72f71968a Merge "Only search for test suite jdk files once" am: 6961b14269
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I8102ee297fbba527a6e997bc939681ec407e0b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:23:53 +00:00
Treehugger Robot
6961b14269 Merge "Only search for test suite jdk files once" 2023-05-12 05:53:11 +00:00
Joe Onorato
60ebe5ec28 Merge "Add release flag logic based on TARGET_RELEASE." am: 48fbf97b3e am: 6a3278d350 am: 993648e7fa
Original change: https://android-review.googlesource.com/c/platform/build/+/2581130

Change-Id: I1c9b973a0e5d83e64b4aa33fd4199f1c46ade87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 03:57:02 +00:00
Joe Onorato
6a3278d350 Merge "Add release flag logic based on TARGET_RELEASE." am: 48fbf97b3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2581130

Change-Id: I15290ed9a3ceb59a4acba9a7075d457f95536e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 02:30:44 +00:00
Joe Onorato
48fbf97b3e Merge "Add release flag logic based on TARGET_RELEASE." 2023-05-12 01:44:46 +00:00
Treehugger Robot
178c7607fd Merge "Remove wildcards of absolute paths" am: dc5ec0bfd8 am: f08f1ad8f9 am: 272c85aa6c
Original change: https://android-review.googlesource.com/c/platform/build/+/2584263

Change-Id: I3107faccda40390835c7bd2b05b957a6174038c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 01:22:56 +00:00