Commit Graph

81856 Commits

Author SHA1 Message Date
Edward Liaw
77dc36e521 Merge "vts: split kselftests and ltp" am: cfb5fb5227 am: 29fa97aeea am: 428d005fb2 am: 670268eb26
Original change: https://android-review.googlesource.com/c/platform/build/+/2192098

Change-Id: Ie9b10a7aff6e4487b740de342c5773d3aae268c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 16:58:31 +00:00
Edward Liaw
670268eb26 Merge "vts: split kselftests and ltp" am: cfb5fb5227 am: 29fa97aeea am: 428d005fb2
Original change: https://android-review.googlesource.com/c/platform/build/+/2192098

Change-Id: I9da9515b3c6e922aaf7445228c72e6e7a547dec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 16:19:39 +00:00
Edward Liaw
428d005fb2 Merge "vts: split kselftests and ltp" am: cfb5fb5227 am: 29fa97aeea
Original change: https://android-review.googlesource.com/c/platform/build/+/2192098

Change-Id: Ic88ca98bf0cec18d69a9aadda85c59146ea0c0bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 15:51:53 +00:00
Edward Liaw
29fa97aeea Merge "vts: split kselftests and ltp" am: cfb5fb5227
Original change: https://android-review.googlesource.com/c/platform/build/+/2192098

Change-Id: I9afd5966f58646d7780567ccc33dbe6dc31b9413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 15:23:23 +00:00
Edward Liaw
cfb5fb5227 Merge "vts: split kselftests and ltp" 2022-09-20 15:00:58 +00:00
Treehugger Robot
eacd160398 Merge "Only keep Parcelables if used" am: b2bf9efa32 am: 486a92f509 am: a4297f6b50 am: 3d344efdb2
Original change: https://android-review.googlesource.com/c/platform/build/+/2222341

Change-Id: I98985507c457130f689a72d96ca00c06410cee47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 05:37:03 +00:00
Treehugger Robot
3d344efdb2 Merge "Only keep Parcelables if used" am: b2bf9efa32 am: 486a92f509 am: a4297f6b50
Original change: https://android-review.googlesource.com/c/platform/build/+/2222341

Change-Id: I41f295cb82e42205c404fa6d1b511dc8d062d070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 05:11:27 +00:00
Treehugger Robot
a4297f6b50 Merge "Only keep Parcelables if used" am: b2bf9efa32 am: 486a92f509
Original change: https://android-review.googlesource.com/c/platform/build/+/2222341

Change-Id: I79d54c8768b8abf87764089f26e65ba2213a80d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 04:44:14 +00:00
TreeHugger Robot
8811e61dcf Merge "Target dist files not dist goals." into tm-d1-dev-plus-aosp am: 55b6b0827c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19996709

Change-Id: I33f4a593ffbba3a8fcc4249bd93c84109996a2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 04:30:28 +00:00
Treehugger Robot
486a92f509 Merge "Only keep Parcelables if used" am: b2bf9efa32
Original change: https://android-review.googlesource.com/c/platform/build/+/2222341

Change-Id: I8afb77b02deaa77a9299a684ce1e48096b31fcef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 04:14:55 +00:00
TreeHugger Robot
55b6b0827c Merge "Target dist files not dist goals." into tm-d1-dev-plus-aosp 2022-09-20 03:55:14 +00:00
Treehugger Robot
b2bf9efa32 Merge "Only keep Parcelables if used" 2022-09-20 03:47:31 +00:00
Yike Zhang
6f65d5f649 Merge "Export the target_required property to module-info" am: d8b3c2901d am: 021d4f8f55 am: 0691f3d115 am: 41b179a1ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2219529

Change-Id: Ie3ed59d7edcb795f683bb432220443f7fe383109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 02:41:15 +00:00
Yike Zhang
41b179a1ee Merge "Export the target_required property to module-info" am: d8b3c2901d am: 021d4f8f55 am: 0691f3d115
Original change: https://android-review.googlesource.com/c/platform/build/+/2219529

Change-Id: Ib0a79a16c9615a62f5c4b6b84ead1c109d5f1d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 02:02:22 +00:00
Yike Zhang
0691f3d115 Merge "Export the target_required property to module-info" am: d8b3c2901d am: 021d4f8f55
Original change: https://android-review.googlesource.com/c/platform/build/+/2219529

Change-Id: If61fe0f8c2baf66abf9ffa509c16e71d3fc6377e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 01:32:17 +00:00
Yike Zhang
021d4f8f55 Merge "Export the target_required property to module-info" am: d8b3c2901d
Original change: https://android-review.googlesource.com/c/platform/build/+/2219529

Change-Id: Id1a0264a567165efae664612ef5938c35f094e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 01:01:07 +00:00
Bob Badour
bf657b54a4 Target dist files not dist goals.
This change creates license texts and lists of projects to share for
individual files in dist instead of for dist goals.

If a distribution needs the license texts for part of a dist file or
for a combination of multiple files, whoever is distributing will have
to create a suitable text notice using `gen_notice{}` or `testnotice`
and include it among the dist files for the goal using `dist-for-goals`
or equivalent.

Bug: 240342946

Test: m cts dist

Test: m droid dist

Test: tapas google-tradefed-all && m dist

Change-Id: I5f198d6eb70f20057762c6ea32d85bc4fd603e49
2022-09-19 17:38:26 -07:00
Yike Zhang
d8b3c2901d Merge "Export the target_required property to module-info" 2022-09-20 00:34:28 +00:00
Jared Duke
9d27a928f2 Only keep Parcelables if used
Use `-keepclassmembers` instead of `-keep` for Parcelable types
and their CREATOR members. This allows shrinking of Parcelable types
that aren't referenced while still preserving the necessary CREATOR
member when the classes are kept. This saves ~3MB across various
platform targets.

Bug: 238670321
Test: m + presubmit
Change-Id: I13508073dbc07e28aa93bb6604c8f838bcf72646
2022-09-19 16:26:44 -07:00
Bob Badour
91d346e1a4 [automerger skipped] Target dist files not dist goals. am: 76a23a3207 -s ours am: 173ec28350 -s ours
am skip reason: Merged-In I9fbcb07acfa7b14a140563cb031374160b6b23c2 with SHA-1 5a4fe7aa62 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19994646

Change-Id: I876f80220add6c037e481b333ae1680e27171a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 23:20:33 +00:00
Bob Badour
173ec28350 [automerger skipped] Target dist files not dist goals. am: 76a23a3207 -s ours
am skip reason: Merged-In I9fbcb07acfa7b14a140563cb031374160b6b23c2 with SHA-1 5a4fe7aa62 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19994646

Change-Id: I7a4e1bb643580d7ef5e1d2430b0e4badc835e2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 22:21:08 +00:00
Bob Badour
76a23a3207 Target dist files not dist goals.
This change creates license texts and lists of projects to share for
individual files in dist instead of for dist goals.

If a distribution needs the license texts for part of a dist file or
for a combination of multiple files, whoever is distributing will have
to create a suitable text notice using `gen_notice{}` or `testnotice`
and include it among the dist files for the goal using `dist-for-goals`
or equivalent.

Bug: 240342946

Test: m cts dist

Test: m droid dist

Test: tapas google-tradefed-all && m dist

Change-Id: Iaea79fc1ecf34e2ace6403d8ef86c667dc9937b2
Merged-in: Iaea79fc1ecf34e2ace6403d8ef86c667dc9937b2
Merged-in: I9fbcb07acfa7b14a140563cb031374160b6b23c2
2022-09-19 20:21:30 +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
Victor Hsieh
81371e143a Merge "Reland: Generate fs-verity build manifst APK for other partitions" am: 90195c958d am: 41e6b26779 am: 2486db519f am: be3575ddad
Original change: https://android-review.googlesource.com/c/platform/build/+/2215026

Change-Id: I6ce034b8a7a071833111cd4fc06471447935d4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 00:58:07 +00:00
Victor Hsieh
be3575ddad Merge "Reland: Generate fs-verity build manifst APK for other partitions" am: 90195c958d am: 41e6b26779 am: 2486db519f
Original change: https://android-review.googlesource.com/c/platform/build/+/2215026

Change-Id: Ib734ab4a10d1af199424ed2427625c9bd178534e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 23:21:40 +00:00
Victor Hsieh
2486db519f Merge "Reland: Generate fs-verity build manifst APK for other partitions" am: 90195c958d am: 41e6b26779
Original change: https://android-review.googlesource.com/c/platform/build/+/2215026

Change-Id: If9b2837596bc83c78140f6569649786860ed7cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:52:50 +00:00
Victor Hsieh
41e6b26779 Merge "Reland: Generate fs-verity build manifst APK for other partitions" am: 90195c958d
Original change: https://android-review.googlesource.com/c/platform/build/+/2215026

Change-Id: I49bf0d67058eabb75f63349b10c906ff1b869f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:21:45 +00:00
Victor Hsieh
90195c958d Merge "Reland: Generate fs-verity build manifst APK for other partitions" 2022-09-15 21:49:43 +00:00
Treehugger Robot
f3708467b7 Merge "Fix incorrect input for path and entry" am: e98964339e am: 6fcd2b4325 am: 31e3ab6af1 am: fe9821c260
Original change: https://android-review.googlesource.com/c/platform/build/+/2215166

Change-Id: I96092a8d587eb515c5330d17cd00ecd13bf3d897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 03:55:15 +00:00
Treehugger Robot
fe9821c260 Merge "Fix incorrect input for path and entry" am: e98964339e am: 6fcd2b4325 am: 31e3ab6af1
Original change: https://android-review.googlesource.com/c/platform/build/+/2215166

Change-Id: I6406837c11b8950da41a5cf3c06855d81f04eccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 03:29:03 +00:00
Treehugger Robot
31e3ab6af1 Merge "Fix incorrect input for path and entry" am: e98964339e am: 6fcd2b4325
Original change: https://android-review.googlesource.com/c/platform/build/+/2215166

Change-Id: I6d752e291ca12c3eedfade5e536bac0cdd9777b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 03:00:30 +00:00
Treehugger Robot
6fcd2b4325 Merge "Fix incorrect input for path and entry" am: e98964339e
Original change: https://android-review.googlesource.com/c/platform/build/+/2215166

Change-Id: I6297abfe1e46c071a6e54660bc43a6a91c5d66d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 02:29:49 +00:00
Treehugger Robot
e98964339e Merge "Fix incorrect input for path and entry" 2022-09-15 01:54:29 +00: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
Treehugger Robot
bdae2b8e69 Merge "Normalize target path for license dependencies." am: 1acd7b0438 am: a21737a58f am: f1fd15f02c am: ba5d947d23
Original change: https://android-review.googlesource.com/c/platform/build/+/2215326

Change-Id: I4e3ccf46b30e1c8afae11dee3e1dc6729ffdb88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 21:20:10 +00:00
Treehugger Robot
019485a857 Merge "Put host license metadata in OUT_DIR." am: ebb4bfe9c9 am: faacd30690 am: 9cb0db8420 am: 6fe2e2b326
Original change: https://android-review.googlesource.com/c/platform/build/+/2215325

Change-Id: Id5a1ef4c2f0755b850e14fdd9b1b7481e63445e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 21:19:41 +00:00
Treehugger Robot
ba5d947d23 Merge "Normalize target path for license dependencies." am: 1acd7b0438 am: a21737a58f am: f1fd15f02c
Original change: https://android-review.googlesource.com/c/platform/build/+/2215326

Change-Id: I4a03f6a4c2c35718bc26232a3f25ede6538e1964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:21:19 +00:00
Treehugger Robot
6fe2e2b326 Merge "Put host license metadata in OUT_DIR." am: ebb4bfe9c9 am: faacd30690 am: 9cb0db8420
Original change: https://android-review.googlesource.com/c/platform/build/+/2215325

Change-Id: I7c047d816f98a0aacfeb781d5a77a9eaa7ef3cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:20:55 +00:00
Victor Hsieh
89415a8ea9 Reland: Generate fs-verity build manifst APK for other partitions
* Expand the allowlist to include {system_ext, vendor, odm,
   product}/framework/*. Generate .fsv_meta for them.
 * Add BuildManifest.apk for those partitions.
 * Rename PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA to remove "SYSTEM".
 * (new in reland): add apkcerts

Bug: 245957815
Test: m
Test: ls -l $ANDROID_PRODUCT_OUT/*/etc/security/fsverity/BuildManifest.apk
Test: extract assets/build_manifest.pb from apk, inpsect
Test: run asit/ota/signing
Change-Id: I48a5e473aa5eedb24edab54357a9141fc8d78759
2022-09-14 13:19:26 -07:00
Treehugger Robot
f1fd15f02c Merge "Normalize target path for license dependencies." am: 1acd7b0438 am: a21737a58f
Original change: https://android-review.googlesource.com/c/platform/build/+/2215326

Change-Id: I06bc33a37742ff0f67d99622f56cf02f9ebc1868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 19:51:28 +00:00
Treehugger Robot
9cb0db8420 Merge "Put host license metadata in OUT_DIR." am: ebb4bfe9c9 am: faacd30690
Original change: https://android-review.googlesource.com/c/platform/build/+/2215325

Change-Id: Ibf7436309f77931c9ea0fda81406a87865f72982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 19:51:07 +00:00
Treehugger Robot
22268449f6 Merge "Increase javac heap to 4096M" am: ef425ee163 am: 1225b4ab9c am: 5d20a1f706 am: 58693704e7
Original change: https://android-review.googlesource.com/c/platform/build/+/2217241

Change-Id: Iefe1b6a8713c02869b03c3d294ec40e85754de32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 19:21:31 +00:00
Treehugger Robot
a21737a58f Merge "Normalize target path for license dependencies." am: 1acd7b0438
Original change: https://android-review.googlesource.com/c/platform/build/+/2215326

Change-Id: Ic35c5b86a51739c11a4ccf9a149ec80408bbf20e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 19:19:37 +00:00
Treehugger Robot
faacd30690 Merge "Put host license metadata in OUT_DIR." am: ebb4bfe9c9
Original change: https://android-review.googlesource.com/c/platform/build/+/2215325

Change-Id: Ib51c3b812faa14a634edff9bd9a325eea2fc3256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 19:18:49 +00:00
Victor Hsieh
39ad067ae7 Merge "Revert "Generate fs-verity build manifst APK for other partitions"" am: 7942ba9a1e am: d80c41f064 am: 2596fd4843 am: c18156667c
Original change: https://android-review.googlesource.com/c/platform/build/+/2216673

Change-Id: I673b70698001879705b1dde5e7f784ace7217f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 19:06:08 +00:00
Treehugger Robot
1acd7b0438 Merge "Normalize target path for license dependencies." 2022-09-14 18:48:30 +00:00
Treehugger Robot
ebb4bfe9c9 Merge "Put host license metadata in OUT_DIR." 2022-09-14 18:45:51 +00:00
Treehugger Robot
58693704e7 Merge "Increase javac heap to 4096M" am: ef425ee163 am: 1225b4ab9c am: 5d20a1f706
Original change: https://android-review.googlesource.com/c/platform/build/+/2217241

Change-Id: I668744673c0f724a6e70f223b5515806223a0e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 18:41:47 +00:00
Victor Hsieh
c18156667c Merge "Revert "Generate fs-verity build manifst APK for other partitions"" am: 7942ba9a1e am: d80c41f064 am: 2596fd4843
Original change: https://android-review.googlesource.com/c/platform/build/+/2216673

Change-Id: Ibbb9c77745f22ae2943bb20edfa63baffc7f64c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 18:41:31 +00:00
Treehugger Robot
3c01cec06f Merge "core: Introduce a pvmfwimage phony target" am: e986ab2038 am: c604e8eb12 am: de5c029087 am: b385dd4be6
Original change: https://android-review.googlesource.com/c/platform/build/+/2213455

Change-Id: I8d9f7697b8de4e200dcca0dab0da7ddbd9faf3cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 18:39:15 +00:00