Steven Moreland
aa81ee2a6e
remove reference to old VTS config
...
No longer exists, no longer used.
Bug: 274790216
Test: N/A
Change-Id: Id11921707cd5141235850d88a6d2397e85726532
2023-03-22 21:11:42 +00:00
Ye Jiao
0786af077c
Add config to skip state toggle off/on for Wi-Fi NAN
...
If STA and NAN share the same iface wlan0, Wi-Fi vendor HAL service
sends eventDisabled to NAN framework when STA setMacAddress to wlan0.
This disables NAN when STA is turned on.
Since NAN always uses its own random MAC instead of using MAC of STA,
this action is not necessary and gets NAN kicked off for no benefits.
We add a build time configuration to optionally disable this behavior.
Bug: 273426515
Test: manually test
Change-Id: If0d84b3898387b75392c8012640bc728126f2cff
2023-03-22 20:05:41 +00:00
Oleg Lyovin
6d75a854ef
Fix choosing wrong diff tool for recovery-from-boot patch
...
'bsdiff' tool should be used when recovery and boot image
have mismatching entries. This includes not only the case
when system_as_root enabled, but include_recovery_dtbo and
include_recovery_acpio too.
Add check if they are enabled to synchronize logic with
core/Makefile, which already takes this into account.
Test: make dist -j
Change-Id: Ie673403ae8eae446d006cc524dd48ac6c56194fc
Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
2023-03-22 17:53:26 +03:00
Treehugger Robot
a509c972f5
Merge "Retire QEMU_DISABLE_AVB" am: e8554eff3a
am: 3bd2cb00da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2500959
Change-Id: Icdb2e1586f7ca248cc8d067dd6f22e77f642c343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:50:12 +00:00
Hsin-Yi Chen
292b420dcf
Merge "Revert "remove health library from VNDK"" am: 14f240351e
am: 4109e2bef4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2499615
Change-Id: I3183bdc592a47bb92ce889c99ff485f8b199829f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:49:35 +00:00
Julien Desprez
be8fb0306d
Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618
am: ef94a26990
am: 28893e555e
am: b3e982fc10
am: 335a11d79c
am: de0873f77b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Change-Id: If0c49e73ae73ea3b22820b42e042a14e260ba87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:49:19 +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
de0873f77b
Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618
am: ef94a26990
am: 28893e555e
am: b3e982fc10
am: 335a11d79c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Change-Id: If78ca764fc2eea83d646992091cc01d5098e878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:11:55 +00:00
Julien Desprez
660e9fa2e3
Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6
am: cd608825a3
am: 50d29f770b
am: 63c3099dc8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151
Change-Id: I4b9328b17a82fdbad4b3bd97de40f256c3e9f6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:11:39 +00:00
Treehugger Robot
3bd2cb00da
Merge "Retire QEMU_DISABLE_AVB" am: e8554eff3a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2500959
Change-Id: I05c1e6b5976b09e466af2844f9228664f5140b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:09:58 +00:00
Hsin-Yi Chen
4109e2bef4
Merge "Revert "remove health library from VNDK"" am: 14f240351e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2499615
Change-Id: I157620ff3791a34cb82b3c1593fae0d7dcebb83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:09:38 +00:00
Treehugger Robot
e8554eff3a
Merge "Retire QEMU_DISABLE_AVB"
2023-03-22 02:45:08 +00:00
Hsin-Yi Chen
14f240351e
Merge "Revert "remove health library from VNDK""
2023-03-22 02:15:35 +00:00
Julien Desprez
335a11d79c
Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618
am: ef94a26990
am: 28893e555e
am: b3e982fc10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Change-Id: I2ccf5c714ce18825d79a80f85d99d10fd4469a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 02:14:07 +00:00
Julien Desprez
63c3099dc8
Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6
am: cd608825a3
am: 50d29f770b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151
Change-Id: Ia8228324a2ef9ad69aaefc6352e22113dd24ce58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 02:13:57 +00:00
Julien Desprez
b3e982fc10
Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618
am: ef94a26990
am: 28893e555e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Change-Id: I48f51283793c87fb2a2dd2f1aa760fca9be83d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 01:33:53 +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
Julien Desprez
28893e555e
Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618
am: ef94a26990
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Change-Id: If69d8abad0afb1a0da969447dd82ea1b7ae8b7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 00:59:05 +00:00
Julien Desprez
cd608825a3
Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151
Change-Id: I7082e28688912f848f0be54fbd445319029d80fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 00:58:49 +00:00
Julien Desprez
ef94a26990
Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Change-Id: I2b8124ebb03c67542241240aa196743d0eb06d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 00:55:52 +00:00
Julien Desprez
df75dca618
Merge "Remove tradefed-no-fwk from suites" into sc-dev
2023-03-22 00:32:22 +00:00
Julien Desprez
48c10589c6
Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev
...
* changes:
[automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
Remove tradefed-no-fwk from suites
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
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
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
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
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