Julien Desprez
df75dca618
Merge "Remove tradefed-no-fwk from suites" into sc-dev
2023-03-22 00:32:22 +00:00
Roman Kiryanov
dd0483995d
Retire QEMU_DISABLE_AVB
...
never enabled
Bug: 274103438
Test: presubmit
Change-Id: I4296bef2924d2f041d3e9cbfd2bb3ab0c2a72c75
Signed-off-by: Roman Kiryanov <rkir@google.com >
2023-03-21 15:30:21 -07:00
Android Build Coastguard Worker
1b7e729e66
Version bump to UP1A.230321.002 [core/build_id.mk]
...
Change-Id: I8ca9c5178fffcc9efc93a597868e61364be64233
2023-03-21 19:04:01 +00:00
Treehugger Robot
0db017be76
Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6
am: 8925166fff
am: c02e0f7ad8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535
Change-Id: I17e60bc7c1afcff45c03059fcdc054422d5c56b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 18:25:25 +00:00
Nicolas Geoffray
02844ff77b
Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36
am: 22d145424a
am: 5325cd5cdf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995
Change-Id: I8580a642c577b1f4c0f012ec967f5f60e19d178c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 18:23:29 +00:00
Treehugger Robot
c02e0f7ad8
Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6
am: 8925166fff
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535
Change-Id: I38ee795422205a79eec93a6f55fbb6570e38811f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 16:49:21 +00:00
Nicolas Geoffray
5325cd5cdf
Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36
am: 22d145424a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995
Change-Id: Icac6f47314a704c0836e17a20109da1e72b248a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 16:48:18 +00:00
Treehugger Robot
8925166fff
Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535
Change-Id: I3d927a6953c24d49ad1f3a26bd3ffbe88b399c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 16:11:34 +00:00
Nicolas Geoffray
22d145424a
Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995
Change-Id: I2888a5d1b20ee95a94514fed426e4bf9b5e3be51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 16:10:03 +00:00
Treehugger Robot
d7600be9a6
Merge "Disable system_server.zip generation for ART prebuilts"
2023-03-21 15:19:58 +00:00
Nicolas Geoffray
3a6ebaac36
Merge "Use the boot image mainline extension when dexpreopting in Make."
2023-03-21 14:51:20 +00:00
Hsin-Yi Chen
f623c266ca
Revert "remove health library from VNDK"
...
This reverts commit dbbe29a15f
.
Bug: 274406085
Reason for revert: VNDK 33 should not be modified in U branches.
Change-Id: If374d4718243e04e03c48a9c6bbd8f10e3eea898
2023-03-21 09:36:26 +00:00
Pranav Gupta
1da7219ed1
Disable system_server.zip generation for ART prebuilts
...
system_server.zip does not need to be generated when using the prebuilt mainline modules or if ART_MODULE_BUILD_FROM_SOURCE is false or if MODULE_BUILD_FROM_SOURCE is false
Bug: 274051753
Change-Id: Ifc638eb4e14ed9ea078125d1780a02b9de6b9ccc
2023-03-21 07:30:37 +00:00
Treehugger Robot
782f63fc5c
Merge "Disable frameworks loading of renderscript libs" am: 0a70a53cc9
am: 5c129b5fc7
am: fe599cb1b2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485705
Change-Id: If57a27659431a2d504b770d8eaf18fa8d60fb5c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 04:57:39 +00:00
Treehugger Robot
c39ca1406d
Merge "Remove vtsc host tool" am: 896e7c715e
am: d0362d7b16
am: 75c71733ef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778
Change-Id: I2de4252e46022157e44773294fca721747307e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 04:57:11 +00:00
Android Build Coastguard Worker
741e4e5b4d
Make change and version bump to UP1A.230321.001
...
Snap for 9781601 from c3d308eb5e
to udc-release
Change-Id: Ifadd4bbb6285c33efc4e8d4ee3f4ce441b88ace3
2023-03-21 04:04:47 +00:00
Treehugger Robot
fe599cb1b2
Merge "Disable frameworks loading of renderscript libs" am: 0a70a53cc9
am: 5c129b5fc7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485705
Change-Id: Ie1d60fecb5d5a5dc644fb909e421581582ffe8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 03:58:02 +00:00
Treehugger Robot
75c71733ef
Merge "Remove vtsc host tool" am: 896e7c715e
am: d0362d7b16
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778
Change-Id: Ic52c0427a575f1c37f8f5b89c0209ac16b736012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 03:57:38 +00:00
Treehugger Robot
5c129b5fc7
Merge "Disable frameworks loading of renderscript libs" am: 0a70a53cc9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485705
Change-Id: I4bda385b60349b562a3dbe11ec2ff843efd3baf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 03:37:33 +00:00
Treehugger Robot
0a70a53cc9
Merge "Disable frameworks loading of renderscript libs"
2023-03-21 03:27:53 +00:00
Treehugger Robot
d0362d7b16
Merge "Remove vtsc host tool" am: 896e7c715e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778
Change-Id: I86f0c32a9fd70225142ca639ceca9496ca787045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 03:18:08 +00:00
Treehugger Robot
896e7c715e
Merge "Remove vtsc host tool"
2023-03-21 02:14:34 +00:00
Spandan Das
0c01c90544
Update hardcoded references to android_*stubs_current
...
The hardcoded references should be updated to variables exported by
Soong. This enables the stub selection logic to exist in a single place.
Test: TH
Test: No change in out/build-<lunch_product>.ninja
Change-Id: I153f1c6ffc6c93d8a64c3edfef3e8d52c84207a3
2023-03-20 21:59:18 +00:00
Treehugger Robot
c3d308eb5e
[automerger skipped] Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f41
am: 708b70a554
am: 3c79e80233
-s ours
...
am skip reason: Merged-In Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c with SHA-1 95b546475f
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2497575
Change-Id: Ibbb534794f86a193a739a89a27863a58430465b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 21:53:24 +00:00
Cole Faust
e08325fb55
Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57
am: 299878fb17
am: bfbb7718c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212
Change-Id: I66d57643ba132b420edf9725d9b4bd36457f692f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 21:52:52 +00:00
Treehugger Robot
3c79e80233
Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f41
am: 708b70a554
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2497575
Change-Id: I9479b1cc06bcd4d2abd5ac4009bfa92b4f24acfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 21:16:00 +00:00
Cole Faust
bfbb7718c7
Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57
am: 299878fb17
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212
Change-Id: Ie773663bd3cd5770af0e754ee29c9f411d574244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 21:14:47 +00:00
Treehugger Robot
708b70a554
Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f41
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2497575
Change-Id: I2af15504339a524984cacd9be201ccb26ec9c1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 20:51:40 +00:00
Treehugger Robot
5f3ddd4f41
Merge "Add rkpd to the list of individually toggleable modules"
2023-03-20 20:41:51 +00:00
Cole Faust
299878fb17
Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212
Change-Id: I8b594224eace23296b5b9a8a7d6a16d5b14b9f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 20:28:26 +00:00
Cole Faust
14108b6a57
Merge "Create image apexes by default instead of flattened apexes"
2023-03-20 19:54:49 +00:00
Treehugger Robot
76394be62a
Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f
am: d90bc8e5ee
am: 96a1cfe673
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355
Change-Id: If650e824bbf7f7446e3c4b922dd8a471d3a8e543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 19:47:23 +00:00
Android Build Coastguard Worker
50d934a411
Version bump to UP1A.230320.002 [core/build_id.mk]
...
Change-Id: Idf48064c8097eef1c847aa971381fe16468006bc
2023-03-20 19:22:08 +00:00
Treehugger Robot
96a1cfe673
Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f
am: d90bc8e5ee
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355
Change-Id: Ia41fb01d563745f2b13a95875273a5c0347ab7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 19:02:32 +00:00
Jiakai Zhang
fb2734e36b
Use the boot image mainline extension when dexpreopting in Make.
...
aosp/2470961 introduces a boot image mainline extension. We need to use
it when dexpreopting apps in Make.
Bug: 274059172
Bug: 269230245
Test: See "boot-framework-adservices.art" in
out/target/product/vsoc_x86_64/obj/APPS/PrebuiltGmail_intermediates/oat/x86_64/package.invocation
on internal master.
Change-Id: Ic0b1753a0066bd16a31de028743f1ad908e9bdfc
2023-03-20 18:42:13 +00:00
Cole Faust
5e2491eff2
Create image apexes by default instead of flattened apexes
...
This is a list of all the internal master products that
use flattened apexes before and after this commit:
https://diff.googleplex.com/#key=AcyUcqOwqpXZ
Apexes can still be flattened by setting `TARGET_FLATTEN_APEX := true`
or `OVERRIDE_TARGET_FLATTEN_APEX := true` in their product config.
Bug: 254205429
Test: presubmits
Change-Id: I5b15f0fc9e149730fd33722632a8ac14432ab757
2023-03-20 18:39:22 +00:00
Treehugger Robot
d90bc8e5ee
Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355
Change-Id: I9bfbdb88583a77da1dcddc78d10990ecc75ac889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 18:23:30 +00:00
Treehugger Robot
6dcf429d8f
Merge "[config] Boards can supply custom super image script"
2023-03-20 17:52:41 +00:00
Paul Duffin
a537224b3a
Add rkpd to the list of individually toggleable modules
...
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.
Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
m MODULE_BUILD_FROM_SOURCE=true droid
m MODULE_BUILD_FROM_SOURCE=false droid
# Make sure that they build from sources and prebuilts respectively.
Merged-In: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
(cherry picked from commit 95b546475f
)
2023-03-20 16:21:23 +00:00
Paul Duffin
d82796bbf8
Merge "Add rkpd to the list of individually toggleable modules" into udc-dev
2023-03-20 16:13:18 +00:00
Ziwei Zhang
34a9f9c13e
Merge "Add python mobly test template xml." am: 0a25e67404
am: 863bf01391
am: 31337205d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502
Change-Id: I8a7a54ca25114c61782aac8e7c4f6ea8597ff925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 04:08:05 +00:00
Ziwei Zhang
31337205d6
Merge "Add python mobly test template xml." am: 0a25e67404
am: 863bf01391
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502
Change-Id: I15452245b1a59125d5e40b6fa1d3bd81090da4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 03:28:46 +00:00
Ziwei Zhang
863bf01391
Merge "Add python mobly test template xml." am: 0a25e67404
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502
Change-Id: Iaa49cce73a448b3538a77004a9ec82d2699980fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 02:50:34 +00:00
Ziwei Zhang
0a25e67404
Merge "Add python mobly test template xml."
2023-03-20 02:16:04 +00:00
Android Build Coastguard Worker
e51ac4399d
Make change and version bump to UP1A.230320.001
...
Snap for 9774436 from 781e7210e2
to udc-release
Change-Id: Ia7fd0c1e31aae5f95964fb82e5f920aac34dc5c8
2023-03-20 02:04:08 +00:00
Android Build Coastguard Worker
2f89cd7d9a
Make change and version bump to UP1A.230319.001
...
Snap for 9773131 from 781e7210e2
to udc-release
Change-Id: I4d223feaa8cf6f3ed046b52dc7f7edce08600c34
2023-03-19 02:04:47 +00:00
Android Build Coastguard Worker
8f54bc05b0
Make change and version bump to UP1A.230318.001
...
Snap for 9769041 from 781e7210e2
to udc-release
Change-Id: I7c4e0974de74929ee85d0ef8ea9d6c86d2cea0ed
2023-03-18 04:03:30 +00:00
Ludvig Hansson
6d11991f1d
Clean additional Robolectric variable
...
Add LOCAL_INSTRUMENT_SRCJARS to list of variables
to reset when calling CLEAR_VARS from a makefile.
This fixes an issue when generating JaCoCo coverage
reports for Robolectric tests.
The value from another module would bleed into the current
one causing the wrong source directory to be used during
report creation, which in turn resulted in an empty report.
This would only happen for modules still using 'Android.mk';
when using Android.bp files the value for LOCAL_INSTRUMENT_SRCJARS
is always set from 'robolectric.go'.
Bug: 214588476
Test: m clockwork-frameworks-robotests-jacoco
Change-Id: I7b527c82bdbe4db06acd1a1fa1a2443e64ed703d
(cherry picked from commit cc799bdf9161dc3c0f6eb437ed064f9712bbfd6b)
2023-03-17 23:55:29 +00:00
Paul Duffin
95b546475f
Add rkpd to the list of individually toggleable modules
...
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.
Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
m MODULE_BUILD_FROM_SOURCE=true droid
m MODULE_BUILD_FROM_SOURCE=false droid
# Make sure that they build from sources and prebuilts respectively.
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
2023-03-17 22:26:54 +00:00
Aidan Wolter
fbf53522cf
[config] Boards can supply custom super image script
...
Some boards may need to customize the format of the super image. We will
now provide the variable BOARD_CUSTOM_BUILD_SUPER_IMAGE so that boards
can provide their own script for constructing the super image. This
mimics similar code in the same file for allowing boards to supply a
custom VBMeta (BOARD_CUSTOM_AVBTOOL) or boot image
(BOARD_CUSTOM_MKBOOTIMG).
Bug: None
Change-Id: I461caeb6dfb705fd5c671228fc35561ed403a1cb
2023-03-17 20:17:35 +00:00