Commit Graph

1054 Commits

Author SHA1 Message Date
Treehugger Robot
1045e6e398 Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a am: 2e5dfd6a0b
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662

Change-Id: Ic468ff195cbfaa55e00ce2aa6cbdf74ffca077a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:34:11 +00:00
Treehugger Robot
d67a345f9a Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" 2023-03-29 17:04:37 +00:00
Sam Delmerico
4c3b83fe70 add PRODUCT_SOURCE_ROOT_DIRS product variable
Change-Id: I31590eb133511a5dbdb8d6fe436cf511d1a160a2
2023-03-27 14:40:50 -04:00
Colin Cross
99a26d0bfd Merge "Don't read test mapping list in Make" am: 2feb102e4d am: 4979af18b9
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833

Change-Id: I6bb66b00b8344dafcea5825de2e5a65463d186e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 16:55:11 +00:00
Colin Cross
01475b41fb Don't read test mapping list in Make
Reading the test mapping list in Make causes Kati to regenerate
any time a TEST_MAPPING file is added or removed.  Pass the file
to the rule and read it during ninja instead.

Bug: 274987114
Test: m test_mapping
Change-Id: I68a76646d70c85b2cb992e4da52a7854acd370b9
2023-03-24 04:33:07 +00:00
Julien Desprez
1c6aa54306 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 am: 660e9fa2e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I3981b8677b91900aa1785c09faf35dc09cfdc638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:48:26 +00:00
Julien Desprez
50d29f770b Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I660d33b843ad09e5bf51ee326e6dd2250f782148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 01:33:44 +00:00
Treehugger Robot
21eadd9e7a Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6 am: 50aeb8e735
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

Change-Id: Ia9c3f495ee959ffc083ad6f9fefd287b2e5d3a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 19:07:09 +00:00
Presubmit Automerger Backend
fddbfae052 [automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I60b254a6fcfff396b88c80c58a17037817bb5bb7
2023-03-09 23:13:53 +00:00
Dan Shi
7c2982ab87 Update art-host-tests build rule to support partial download
Bug: 272110734
Test: build
Change-Id: Icd13530a662e7989c6d8cb5c68b95857bdeb7182
2023-03-09 00:16:25 +00:00
Julien Desprez
ca46df5783 Remove tradefed-no-fwk from suites
Test: presubmit
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I672533c475362f4438b5aefc108749be4cfc97df
(cherry picked from commit 917acd67c7)
2023-03-08 18:32:09 +00:00
Joe Onorato
3dc4c35514 Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23 am: a29a46050a
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830

Change-Id: Ia1a2478549efd05eac8d2a1325dea31e96adece5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:44:04 +00:00
Joe Onorato
682f36220b Remove OWNERS access for non-build team people to core build system
Test: treehugger
Change-Id: I578a2902b6d0853fffe4c3513322da4c15300513
2023-02-28 10:52:10 -08:00
Florian Mayer
4cb1cd1e80 Merge "driveby: Fix typo" am: 2e39131d80 am: 45f02948a0
Original change: https://android-review.googlesource.com/c/platform/build/+/2449823

Change-Id: I426146aa487ac016ab0421254460a03487468d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:03:30 +00:00
Florian Mayer
5e3f57c2d5 driveby: Fix typo
Change-Id: I3aa8a0bdd15d16975b8b630b03590457b8ac9326
2023-02-24 19:34:25 +00:00
Zhenhuang Wang
a82b2b5658 Merge "Enable -sha256 feature to device-tests.zip" am: 195b5fc64c am: c14d68cebe
Original change: https://android-review.googlesource.com/c/platform/build/+/2442621

Change-Id: I97d1c57c96a46bf973ea6e40f884b9cacaa7646d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 09:05:06 +00:00
Zhenhuang Wang
d1dfcda616 Enable -sha256 feature to device-tests.zip
With `-sha256` flag, file header of generated zip files contains
SHA256 checksum for each file, which can then be used by downstream
systems.

Bug: 259513199
Test: m dist device-tests
Change-Id: Id5d2cba9096983da4f4843146a5eaa84393b4880
2023-02-17 17:48:24 +08:00
Zhenhuang Wang
55ed878a74 Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" am: 371da61096 am: 963bc9676e
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552

Change-Id: If0e839be1b406f6d8f253a9f87c8be0fad86eeff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 03:58:45 +00:00
Zhenhuang Wang
23d8c72472 Revert "Revert "Enable -sha256 feature to some Soong built zip files""
This reverts commit 7d8eeec0dd.

Reason for revert: re-submit the change https://r.android.com/2393272

Change-Id: I6c906a82823a4b69d0cd8a5ce364d802c646cb68
2023-02-14 00:29:30 +00:00
Zhenhuang Wang
def1100a05 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" am: 65ff0460c4 am: 97e73564c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2430432

Change-Id: If36e0842638bd34c67b645bb0e4b4edd868df003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 15:29:50 +00:00
Zhenhuang Wang
7d8eeec0dd Revert "Enable -sha256 feature to some Soong built zip files"
This reverts commit fae06b15ce.

Reason for revert: Some labs are still not upgraded to the latest version, causing presubmit test flaky.

Bug: 268608699
Bug: 259513199
Change-Id: I05f0fef27afdbbd5350e77616074059b7bf1da42
2023-02-10 14:02:06 +00:00
Zhenhuang Wang
354552cfee Merge "Enable -sha256 feature to some Soong built zip files" am: 9544346d39 am: 5c8213b1bd
Original change: https://android-review.googlesource.com/c/platform/build/+/2393272

Change-Id: I10f6896ed8d003f143558deb840223155bc8e408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 09:09:33 +00:00
Zhenhuang Wang
fae06b15ce Enable -sha256 feature to some Soong built zip files
Enable the new soong_zip feature to general-tests.zip,
host-unit-tests.zip, android-cts.zip, android-mts.zip etc. This is a
following change of https://r.android.com/2395452. With `-sha256` flag,
file header of generated zip files contains SHA256 checksum for each
file, which can then be used by downstream systems.

Bug: 259513199
Test: run `m dist host-unit-tests general-tests cts mts` and check zip
    files under `out/dist/`
Change-Id: I726b5261d177beadcd8f707e2cd2cb5cdef20273
2023-01-26 13:49:57 +08:00
Duy Truong
880b9e48c8 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562 am: fc6aa53d53 am: fa4e1c1083 am: 86d92b798d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: Ic8be201357dfe1a8ae494c9d5e47f72e4fb8d689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 12:38:53 +00:00
Duy Truong
fc6aa53d53 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: I7aff25a009ee1804cc3aafe4d783937a5d12d6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 10:09:01 +00:00
Presubmit Automerger Backend
6ee3acaf90 [automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Bug: 238373261
Change-Id: Id6c008dadec007999d0e7a58f5d5d52f95749a45
2023-01-18 23:02:39 +00:00
Duy Truong
3c1caa29b8 Include JDK with STS SDK like the other *TS suites.
Bug: 238373261
Test: Build and run STS SDK sample
Change-Id: I7378a555393e4194917083197829201320e595b4
2023-01-18 23:02:31 +00:00
Robert Shih
1b73bfbd97 Resubmit: Initial add wvts to build
[ Merge of pa/2264578 ]

Test: make wvts

Bug: 209663123
Change-Id: If1382ed06a93bc34d327ee88bf46ff290e84f786
2023-01-11 00:55:50 +00:00
Robert Shih
57fe3f6041 Revert "Initial add wvts to build"
This reverts commit 588f2e62da.

Reason for revert: b/265032293

Change-Id: I6a9dd24cfef2256288170f5bf59d24604f05d4d2
2023-01-10 18:51:18 +00:00
Robert Shih
588f2e62da Initial add wvts to build
[ Merge of pa/2264578 ]

Test: make wvts

Bug: 209663123
Change-Id: I089fcdfc385e9d01aa275f77a566ffecb5340495
2023-01-08 03:38:11 +00:00
Justin Yun
3ddd9f49e2 Revert "Define vendor-hwasan-snapshot target"
This reverts commit 97c140ccad.

As vsdk can capture hwasan snapshot with aosp/2358699, we don't need
this workaround any more.

Bug: 234772527
Test: TH
Change-Id: I94e751949d679a31060bb5fea0147947fc6682f4
2023-01-02 16:07:43 +09:00
Spandan Das
0c851c6534 Add missing target from makefile
The target was missing in the mk file, causing "commands commence before
first target" error.

Test: TH
Change-Id: I0ec4f636daf1171e81bf9c7c764b15e07a25fc80
2022-12-29 21:00:04 +00:00
Ivan Kozlov 🤷🏻‍♂️
28a3ea8628 Merge "Add catbox owners to the OWNERS file" am: 8ca7184bed
Original change: https://android-review.googlesource.com/c/platform/build/+/2325564

Change-Id: I051cb5e69d62c015453be6e3a2d772c19cc821f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:19:49 +00:00
Ivan Kozlov 🤷🏻‍♂️
8ca7184bed Merge "Add catbox owners to the OWNERS file" 2022-12-06 00:10:11 +00:00
Ivan Kozlov
67b97d2998 Add catbox owners to the OWNERS file
Test: N/A
Bug: 226980239
Change-Id: Ie7deb9f91b54eea8a473fb704148d080cef8b525
2022-12-02 16:30:57 -08:00
Treehugger Robot
577bd161cf Merge "Define vendor-hwasan-snapshot target" am: f16593490f
Original change: https://android-review.googlesource.com/c/platform/build/+/2301708

Change-Id: I1fd3adee29cd92febb0b0c0637b5d3f87cab2745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 00:25:06 +00:00
Justin Yun
97c140ccad Define vendor-hwasan-snapshot target
By building vendor-hwasan-snapshot target, static hwasan libraries
for vendor image variants will be snapshoted.
The list of candidate libs must be listed in
PRODUCT_VSDK_HWASAN_STATIC_PATHS with module name and source directory
path separated by colon.

For example,
PRODUCT_VSDK_HWASAN_STATIC_PATHS := \
  libbase:system/libbase \
  libc++_static:external/libcxx

Bug: 234772527
Test: SANITIZE_TARGET=hwaddress m vendor-hwasan-snapshot
Change-Id: Ic179740ae3bc8f90d2c5bbca7289ea72262ba8aa
2022-11-15 18:20:12 +09:00
Treehugger Robot
5a69b09825 Merge "Speed up m command autocompletion" am: a56bce6ef1
Original change: https://android-review.googlesource.com/c/platform/build/+/2272251

Change-Id: I5c617649b184c2e48962993e38d88bd9b0755c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 21:20:31 +00:00
Cole Faust
5d825b7a68 Speed up m command autocompletion
Generate a all_modules.txt file on every build that
can be used for autocompleting.

Because this adds time to every non-incremental build,
I profiled it by using `$(shell date +"%s.%3N")` before
and after, and disovered it only adds about 0.01 seconds
to the build. And of course it won't be rerun if there
weren't build changes.

Bug: 255867758
Test: Manually
Change-Id: I1d3f1008611fd542884322b27b19ea2fa1d341fe
2022-10-28 10:44:02 -07:00
Xin Li
c91853a2ef Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:31 +00:00
Colin Cross
bb5bb5e242 Limit cts-api-coverage parallelism to 8
cts-api-coverage is getting OOM killed in presubmit, likely due to
spawning a copy of dexdeps in parallel for every cpu in the system.
Limit it to 8 parallel subprocesses when running inside the build,
as other processes are likely already using cpu and memory.

Bug: 252817769
Test: m out/host/linux-x86/cts-api-coverage/system-api-coverage.html
Change-Id: Iaae6561ac173d32c1b5af895cab76f3f898da4bb
2022-10-10 10:16:23 -07:00
Duy Truong
5d70edd3a2 Merge changes from topic "sts-sdk" into tm-dev am: 7634f909cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: I1af7b5afd9ae9f07e7d8d5c39920e101cb2aaea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 01:27:15 +00:00
Bob Badour
10f5c48b23 Policy change: GPL+CE is permissive.
Bug: 210546823

Test: m cts compliance_checkshare compliancenotice_bom \
    compliancenotice_shippedlibs compliance_listshare \
    compliance_dumpgraph compliance_dumpresolutions htmlnotice \
    compliance_rtrace textnotice xmlnotice

Change-Id: I7da36972ffbb1494e33fd63db8e5ec851d47704c
2022-09-20 21:50:08 -07:00
Edward Liaw
cfb5fb5227 Merge "vts: split kselftests and ltp" 2022-09-20 15:00:58 +00:00
Yike
450197e265 Export the target_required property to module-info
Some host test modules such as `python_test_host` use the
`target_required` attribute to declare target dependencies that will
be pushed to device. For example, `aidl_integration_test` references
several target dependencies in the `target_required` attribute since
those output files will be searched and pushed to device at runtime.
Besides, those target dependencies can't be declared in the `data`
attribute instead, since some modules' `data` attribute doesn't
support multi-arch.

So that, this information needs to present in module_info.json and
exported to properly generate Bazel targets that include these
dependencies.

Test: m out/target/product/coral/module-info.json
Bug: 222438068
Change-Id: Ia5ee103be1e7a811e1fdbd2b39252912b1a35c18
2022-09-19 16:42:04 +08:00
Edward Liaw
f867471865 vts: split kselftests and ltp
Split the location of ltp and kselftest files so that they are not
uploaded together if running individually.  Should improve the
performance of kselftest.

Bug: 190800715
Test: atest vts_ltp_test_x86_64
Test: atest vts_linux_kselftest_x86_64
Signed-off-by: Edward Liaw <edliaw@google.com>
Change-Id: I121e6d5bab8edd185c8d73ad7849dff9e8b5f118
2022-09-14 22:59:11 +00:00
Yihan Dong
46ee66c098 Merge "Assign each xts test package a copy license metadata" 2022-09-09 00:56:42 +00:00
Yike
82f0a2d751 Export Java libraries into module-info
Some Java modules are defined in Android.mk and they declare
dependencies in eigther LOCAL_STATIC_JAVA_LIBRARIES or
LOCAL_JAVA_LIBRARIES. This information needs to present in
module_info.json and be exported to properly generate Bazel targets
that include these dependencies.

Test: m out/target/product/coral/module-info.json
Bug: 245686435
Change-Id: I77bc8de59f1d46bb098463066e1f52b98ebae955
2022-09-08 07:59:20 +00:00
Yihan Dong
9b75c9ee1a Assign each xts test package a copy license metadata
Use a copy license metadata instead of module_license_metadata to make each xts test package names shown in the final xts notice file.

Test: m gts reportmissinglicenses
Bug: 245474938
Change-Id: Ic5e28763bc4e8448d3e04a80e89db147387164a6
2022-09-07 08:12:37 +00:00
Presubmit Automerger Backend
96c462ed29 [automerge] Initial STS sdk 2p: 5987bd823b 2p: afcd8ed66a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Bug: 238373261
Change-Id: Iecf9a88c03cbb75aae17ad41ee98a2e2e0dad5b8
2022-09-05 16:58:20 +00:00