Commit Graph

1120 Commits

Author SHA1 Message Date
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
85343655f8 Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" am: 371da61096 am: 963bc9676e am: 55ed878a74
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552

Change-Id: I4c2fc30d1f7dab60557df0a7541ad555d3e212ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 04:55:43 +00: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
045624ea85 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" am: 65ff0460c4 am: 97e73564c3 am: def1100a05
Original change: https://android-review.googlesource.com/c/platform/build/+/2430432

Change-Id: Ieee816e874720a88fae431c79470d8ac97a8b24e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 16:17:58 +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
ede5c7217d Merge "Enable -sha256 feature to some Soong built zip files" am: 9544346d39 am: 5c8213b1bd am: 354552cfee
Original change: https://android-review.googlesource.com/c/platform/build/+/2393272

Change-Id: Ie1d90112c5ed79c70599f6cce0f8d61d8b60c47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 10:03:19 +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
31d9a73eef Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562 am: fc6aa53d53 am: 028f962fd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

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

Change-Id: Ib11e135c591d9203868e49e31819d985074a0af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 11:15:52 +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
Treehugger Robot
21e0338f21 Merge "Resubmit: Initial add wvts to build" am: e473190d52 am: a7d2cc7d0a am: 6bb7a5916b
Original change: https://android-review.googlesource.com/c/platform/build/+/2383292

Change-Id: I8f4f788447baa1f52e49bb11dceeafd3a00f51d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 02:12:21 +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
Dan Sinkiewicz
d475e99deb Merge "Revert "Initial add wvts to build"" am: e61203da9c am: 6946b25e3d am: 77e2b1d7dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2382972

Change-Id: I9373282ac961c40f4b13536bc8c9d9548cba1e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 20:58:45 +00:00
Robert Shih
9964162ae8 Merge "Initial add wvts to build" am: 0f8236bb24 am: 8d6ebee56b am: 1079601afa
Original change: https://android-review.googlesource.com/c/platform/build/+/2374652

Change-Id: I458176f4e3bfcc4e29b2fb8b99a96029540e07e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 20:56:52 +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
Treehugger Robot
f73b9d7afa Merge "Revert "Define vendor-hwasan-snapshot target"" am: 0ffb3e522e am: c3dbecdc07 am: e8070b62e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2373468

Change-Id: I34fbf5cc519991b497480437b119e407b5af3591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 19:06:42 +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
Justin Yun
ec6e245f53 Merge "Add missing target from makefile" am: 857260905b am: 7c8ea9d79a am: a0bd05639e
Original change: https://android-review.googlesource.com/c/platform/build/+/2372088

Change-Id: I78d660d52a94a5204428fbccceedbb17c558f9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-02 05:28:52 +00: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 🤷🏻‍♂️
61ecc0adae Merge "Add Traefed Contrib to CATBox" 2022-12-07 19:58:27 +00:00
Ivan Kozlov 🤷🏻‍♂️
f723166503 Merge "Add catbox owners to the OWNERS file" am: 8ca7184bed am: 28a3ea8628 am: 9ae89f8119
Original change: https://android-review.googlesource.com/c/platform/build/+/2325564

Change-Id: I31e416d226f4e4465197ed04527c6dc49648e179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 01:31:10 +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
fd932d314e Merge "Define vendor-hwasan-snapshot target" am: f16593490f am: 577bd161cf am: 14ff7e201c
Original change: https://android-review.googlesource.com/c/platform/build/+/2301708

Change-Id: I71f17b08b9b8e19aad057588fe9ea1c43c8c657e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 01:23:37 +00: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
Sanket Chinchalkar
a527b1a0ee Add Traefed Contrib to CATBox
Test: make catbox
Bug: 226980239
Change-Id: I3012cc4690eda97407846970312f7b9026aaab8f
2022-12-01 16:17:42 -08: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
8f6c9e41d3 Merge "Speed up m command autocompletion" am: a56bce6ef1 am: 5a69b09825 am: 0cf6244e28
Original change: https://android-review.googlesource.com/c/platform/build/+/2272251

Change-Id: I3dc0232f274ac129f0d04da9dca202d5fb3cf510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 22:51:48 +00: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
Treehugger Robot
c9bab71ead Merge "Limit cts-api-coverage parallelism to 8" am: c6ea3aa6e0 am: 2113522011 am: a35e6af4b1
Original change: https://android-review.googlesource.com/c/platform/build/+/2246353

Change-Id: I50156adb27e09cbc0b4b6431ca32b69503fea58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 21:32:17 +00:00
Treehugger Robot
a35e6af4b1 Merge "Limit cts-api-coverage parallelism to 8" am: c6ea3aa6e0 am: 2113522011
Original change: https://android-review.googlesource.com/c/platform/build/+/2246353

Change-Id: I03a1ccbfad1f1f7a48fb5bd9a6f51f686c278395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 20:58:45 +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
Bob Badour
cd25d6134b Merge "Policy change: GPL+CE is permissive." am: 9a76135e44 am: 63a85ce166 am: 9434cd7754 am: 3be77f249e am: 9db6cad5dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2221992

Change-Id: I75ef3d314d78e3493022e02757a92c8548af278e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 13:47:04 +00:00
Duy Truong
64fece21f5 Merge changes from topic "sts-sdk" into tm-dev am: 7634f909cb am: cc4fa9825c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: I51e76786bfa1e22e46658953e380aff54be028d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 02:53:07 +00:00
Duy Truong
cc4fa9825c 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: I120fc8fe749e727a8598b358a146ace905c3ca75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 01:29:47 +00: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
50f712a9ac Merge "vts: split kselftests and ltp" am: cfb5fb5227 am: 29fa97aeea am: 428d005fb2 am: 670268eb26 am: 77dc36e521
Original change: https://android-review.googlesource.com/c/platform/build/+/2192098

Change-Id: Ieaf5b2702e002a5791358cb7ac337595de7cbee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 17:47:09 +00:00
Edward Liaw
cfb5fb5227 Merge "vts: split kselftests and ltp" 2022-09-20 15:00:58 +00:00