Commit graph

8727 commits

Author SHA1 Message Date
Treehugger Robot
f2ed62b4df Merge "Update vndk with update-vndk-list.sh" am: 910393d5a3 am: 23f56b980e am: 6a6be31ed4
Original change: https://android-review.googlesource.com/c/platform/build/+/2599605

Change-Id: I923a6aa1fcd32272adb5359857402a45c4859160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 18:16:34 +00:00
Treehugger Robot
23f56b980e Merge "Update vndk with update-vndk-list.sh" am: 910393d5a3
Original change: https://android-review.googlesource.com/c/platform/build/+/2599605

Change-Id: Ia1900ade879f7647dd38310583362c92c7f18d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:11:46 +00:00
Treehugger Robot
910393d5a3 Merge "Update vndk with update-vndk-list.sh" 2023-05-23 16:33:31 +00:00
Devin Moore
2ea277dbce Update vndk with update-vndk-list.sh
libdiskconfig has been removed.

Test: m
Bug: 280829178
Change-Id: I58948c92012501f2666c8c2b6a99343a141ad1d0
2023-05-23 00:34:09 +00:00
SzuWei Lin
fb27c2954f Support dynamic 64-bit drmserver
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER
to put drmserver_dynamic.rc into GSI. Which starts 64-bit
drmserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit drmserver.

Bug: 282603373
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0
Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0
2023-05-17 05:02:25 +00:00
Treehugger Robot
b028b11a61 Merge "Use non-next NetworkStack" am: b87fd73330
Original change: https://android-review.googlesource.com/c/platform/build/+/2585789

Change-Id: I2106a10a68ada3241d81b3ae9f8897efa05f7464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 23:41:06 +00:00
Motomu Utsumi
8d4354eb2f Merge "Use non-next NetworkStack" into udc-dev am: 586720d590
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23102184

Change-Id: If2fb5c5bbfb15cfe4fec336a0a5f1eee1fc062a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:18:04 +00:00
Motomu Utsumi
49488cff38 Use non-next NetworkStack
NetworkStack now builds against stable U APIs, so U can use
the stable binaries instead of the "next" versions.

Since it has just been bumped, NetworkStack is equivalent to
NetworkStackNext at this point, so this is a no-op.

Bug: 280250560
Test: m
Ignore-AOSP-First: This CL will be cherry-picked to aosp
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f3f48883bcfe8a8f46fdec7affd545c81ba1a8ee)
Merged-In: I00a9840a69d06c6f4246a2db284c3060392b302b
Change-Id: I00a9840a69d06c6f4246a2db284c3060392b302b
2023-05-11 12:40:42 +00:00
Motomu Utsumi
f3f48883bc Use non-next NetworkStack
NetworkStack now builds against stable U APIs, so U can use
the stable binaries instead of the "next" versions.

Since it has just been bumped, NetworkStack is equivalent to
NetworkStackNext at this point, so this is a no-op.

Bug: 280250560
Test: m
Ignore-AOSP-First: This CL will be cherry-picked to aosp
Change-Id: I00a9840a69d06c6f4246a2db284c3060392b302b
2023-05-10 17:30:20 +09:00
Shunkai Yao
8d96939370 Merge "Removed obsolete audio_effects.conf dependency" into udc-dev am: 266bd8aa06
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23036311

Change-Id: I7e3a80bf55e0cd30d2c5e4840988153dd8ae532c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 05:35:26 +00:00
Shunkai Yao
266bd8aa06 Merge "Removed obsolete audio_effects.conf dependency" into udc-dev 2023-05-09 00:04:06 +00:00
Ryan Zuklie
290e598a12 Merge "Revert "(reland) Remove emulator dependencies on non emulator ta..."" am: db4bd944f8 am: b7ea781d01 am: df12c3721a
Original change: https://android-review.googlesource.com/c/platform/build/+/2577678

Change-Id: I4dee5be1d78dea6f7842441329c583cc34982dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 23:54:42 +00:00
Ryan Zuklie
b7ea781d01 Merge "Revert "(reland) Remove emulator dependencies on non emulator ta..."" am: db4bd944f8
Original change: https://android-review.googlesource.com/c/platform/build/+/2577678

Change-Id: I2ebafdf20a8c2cfc8648b42b92cb66432cefd5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 22:44:29 +00:00
Ryan Zuklie
db4bd944f8 Merge "Revert "(reland) Remove emulator dependencies on non emulator ta..."" 2023-05-08 21:59:15 +00:00
Szu-An Lu
527591f248 Revert "(reland) Remove emulator dependencies on non emulator ta..."
Revert submission 2576824-aosp-no-emulator2

Reason for revert: build fail

Reverted changes: /q/submissionid:2576824-aosp-no-emulator2

Bug: 280698810
Change-Id: Id033198251c10bbe774436837e4cddb527062155
2023-05-08 21:20:13 +00:00
Daniel Zheng
67b5cea7d3 Merge "Adding Build time flag to specify Cow Version" am: d00675c764 am: 5236cee23c am: 45084f0317
Original change: https://android-review.googlesource.com/c/platform/build/+/2576750

Change-Id: If8a52e067082defb1ac07c2de79386d5bb19c199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:10:59 +00:00
Daniel Zheng
5236cee23c Merge "Adding Build time flag to specify Cow Version" am: d00675c764
Original change: https://android-review.googlesource.com/c/platform/build/+/2576750

Change-Id: Ic963ae9dee979073592a88bcaf249409cbe36136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:47:32 +00:00
Daniel Zheng
d00675c764 Merge "Adding Build time flag to specify Cow Version" 2023-05-05 22:19:02 +00:00
Daniel Zheng
025099c4bc Adding Build time flag to specify Cow Version
Adding in build time flag for specifying cow version, in preparation to
add new cow version in libsnapshot

Test: m -> cat misc-info.txt
Bug: 279954153
Change-Id: I148d4e7cdd669496c91213889787172ffd83a5ab
2023-05-05 11:03:27 -07:00
Peiyong Lin
5c5e1b1c0c Merge "Split ANGLE supported and enabled into different Makefiles." into udc-dev 2023-05-05 16:24:26 +00:00
Omar Eissa
6453d8b106 Merge "Exclude apps from initial stopped state allow list" into udc-dev am: ae80a8136b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22930878

Change-Id: Iab2e8e19deec781300a3ab16962d4a393ada41aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 14:33:49 +00:00
Treehugger Robot
7cc283ab0c Merge "(reland) Remove emulator dependencies on non emulator targets (2)" am: 52587e3a87 am: c5c90c1183 am: 2f27bfa385
Original change: https://android-review.googlesource.com/c/platform/build/+/2576824

Change-Id: I185f9bda2cbb59b2046ba38bcfc3c53278ae547e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 04:00:30 +00:00
Treehugger Robot
c5c90c1183 Merge "(reland) Remove emulator dependencies on non emulator targets (2)" am: 52587e3a87
Original change: https://android-review.googlesource.com/c/platform/build/+/2576824

Change-Id: If041a531b5e4155a7f5fcbc924fd3a705be655aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 02:11:07 +00:00
Treehugger Robot
52587e3a87 Merge "(reland) Remove emulator dependencies on non emulator targets (2)" 2023-05-05 01:26:13 +00:00
Shunkai Yao
995cfaeace Removed obsolete audio_effects.conf dependency
Bug: 279987639
Test: presubmit
Ignore-AOSP-First: To avoid merge conflict

Change-Id: Ida71c17e8675878ee406900d805ab0eff2e70acd
2023-05-04 20:52:34 +00:00
Automerger Merge Worker
6480e51451 Merge "Merge "Split ANGLE supported and enabled into different Makefiles." am: d2704dc746" into stage-aosp-master am: 1001d9e2c9 am: b96628f013
Original change: https://android-review.googlesource.com/c/platform/build/+/2571352

Change-Id: Iea9ff19384610cc3110707d3030988f4a48485c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:28:14 +00:00
Peiyong Lin
7ab2f27228 Merge "Split ANGLE supported and enabled into different Makefiles." am: d2704dc746
Original change: https://android-review.googlesource.com/c/platform/build/+/2571352

Change-Id: Ic102b32b2ff7e122e1be74c619cd537c96dc07ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:56:12 +00:00
Peiyong Lin
d2704dc746 Merge "Split ANGLE supported and enabled into different Makefiles." 2023-05-04 00:39:57 +00:00
Richard Xie
64051683b2 Merge "Revert "Remove emulator dependencies on non emulator targets (2)"" am: 47bddbced9 am: 936f85905a am: 2cb57c0d37
Original change: https://android-review.googlesource.com/c/platform/build/+/2578933

Change-Id: Ib8082f54b2adc1c3ec96b8e6bdd091b9e81ddccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 23:20:47 +00:00
Richard Xie
936f85905a Merge "Revert "Remove emulator dependencies on non emulator targets (2)"" am: 47bddbced9
Original change: https://android-review.googlesource.com/c/platform/build/+/2578933

Change-Id: Ied77636bec2d058e26c7ebd6e31754de39ac52f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:48:51 +00:00
Roman Kiryanov
f47363caf5 (reland) Remove emulator dependencies on non emulator targets (2)
Bug: 111538404
Test: presubmit
Change-Id: I62531f60db9bd81ea12c898913b3bbd73c873b6f
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-05-03 14:27:48 -07:00
Richard Xie
47bddbced9 Merge "Revert "Remove emulator dependencies on non emulator targets (2)"" 2023-05-03 21:09:56 +00:00
Richard Xie
02b9b9e194 Revert "Remove emulator dependencies on non emulator targets (2)"
Revert submission 2529481-aosp-no-emulator

Reason for revert: DroidMonitor: Potential culprit for Bug 280642806 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2529481-aosp-no-emulator

Change-Id: I732e1b1a1f001fe016a4e20c1a95516995522501
2023-05-03 20:56:54 +00:00
Roman Kiryanov
7ac563dd0f Merge "Remove emulator dependencies on non emulator targets (2)" am: f50711adc4 am: 25a8079ca2 am: f6c36893c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2529481

Change-Id: Ie7b039a82424519c53a38b0f512f40f3157ba570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:39:22 +00:00
Roman Kiryanov
25a8079ca2 Merge "Remove emulator dependencies on non emulator targets (2)" am: f50711adc4
Original change: https://android-review.googlesource.com/c/platform/build/+/2529481

Change-Id: I751e69130a3ab96210cba37e51959edd6e0c44cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:02:38 +00:00
Roman Kiryanov
f50711adc4 Merge "Remove emulator dependencies on non emulator targets (2)" 2023-05-03 17:28:12 +00:00
Peiyong Lin
3161693a62 Split ANGLE supported and enabled into different Makefiles.
ANGLE binaries should be added to the PRODUCT_PACKAGES instead. This
patch also splits the angle.mk to angle_supported.mk and
angle_default.mk so that when a device just wants to ship ANGLE binaries
to coexist with native GLES drivers, it only needs to inherit the
angle_supported.mk and when a device wants to ship ANGLE as the default
system GLES drivers, it only needs to inherit the angle_default.mk. When
ANGLE is the default system GLES driver, make sure persist.graphics.egl
is defined so that ANGLE is loaded properly.

Bug: 270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I3de4a40b62b39c91c8f6df56d68755830b303f10
Merged-In: I3de4a40b62b39c91c8f6df56d68755830b303f10
2023-05-03 17:20:51 +00:00
Peiyong Lin
20d1b668db Split ANGLE supported and enabled into different Makefiles.
ANGLE binaries should be added to the PRODUCT_PACKAGES instead. This
patch also splits the angle.mk to angle_supported.mk and
angle_default.mk so that when a device just wants to ship ANGLE binaries
to coexist with native GLES drivers, it only needs to inherit the
angle_supported.mk and when a device wants to ship ANGLE as the default
system GLES drivers, it only needs to inherit the angle_default.mk. When
ANGLE is the default system GLES driver, make sure persist.graphics.egl
is defined so that ANGLE is loaded properly.

Bug: 270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I3de4a40b62b39c91c8f6df56d68755830b303f10
2023-05-03 16:44:26 +00:00
Treehugger Robot
b981ba578c Merge "Remove config for 64-bit binder ABI" am: 8844e4f145 am: 03ceb1b56e am: be7574828c
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: Ia0c75f07b9ac519460a05ae00b2de9a73f8abc6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:09:38 +00:00
Treehugger Robot
03ceb1b56e Merge "Remove config for 64-bit binder ABI" am: 8844e4f145
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: If2ef5b329f9e246b50c1a2188a45f87677646e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 22:16:16 +00:00
Treehugger Robot
8844e4f145 Merge "Remove config for 64-bit binder ABI" 2023-05-01 21:32:30 +00:00
Omar Eissa
4c9153bae0 Exclude apps from initial stopped state allow list
Exclude apps that we have high confidence that force stopping them
wouldn't be an issue given that they don't need to start until the user
interacts with them.

Bug: 269129704
Test: Manual
Ignore-AOSP-First: Merge conflict from AOSP to internal master (and this needs to go to UDC, als)
Change-Id: I363fbd4d899aed6772199b05fa763be3fa5f31b6
2023-04-28 14:57:03 +00:00
Peiyong Lin
6871bbf91e Properly define angle.mk
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
Merged-In: I4d7ffb869ced219009446d907230178e4b940157
2023-04-27 22:36:36 +00:00
Peiyong Lin
eda45ee725 Merge "Properly define angle.mk" am: c4c3462f2b am: 8c97799f15 am: 8f70890d10
Original change: https://android-review.googlesource.com/c/platform/build/+/2563813

Change-Id: Ia8e2dbf5f1ed5b549bcb1ad53fd57c3bb0ab9e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:16:16 +00:00
Peiyong Lin
8c97799f15 Merge "Properly define angle.mk" am: c4c3462f2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2563813

Change-Id: Ie14484a2aaa545670e9e895aaf7d8c2b4d1daa6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:26:15 +00:00
Martijn Coenen
49697f175b Merge "Add initial stopped state packages for AOSP products." into udc-dev am: 2467b20cec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22427126

Change-Id: I66c458c557d68b86afd9198970c20ac1f10c5c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:05:41 +00:00
Martijn Coenen
2467b20cec Merge "Add initial stopped state packages for AOSP products." into udc-dev 2023-04-27 16:35:34 +00:00
William Loh
783b64d809 Merge "Add preinstalled-packages-asl-files.xml to base_system.mk" into udc-dev am: f06227d7d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22894896

Change-Id: Ib9a75351092bc2b18383dbef2ccff01e02dbb6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 01:56:23 +00:00
William Loh
f06227d7d2 Merge "Add preinstalled-packages-asl-files.xml to base_system.mk" into udc-dev 2023-04-27 01:11:36 +00:00
Peiyong Lin
148276b55a Properly define angle.mk
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
2023-04-26 22:05:20 +00:00
Steven Moreland
52fbc7df01 Remove config for 64-bit binder ABI
Also make it an error to specify the configuration
being removed.

Bug: 232423610
Test: build, boot
Change-Id: I1e4d993c7f4b9628eee6b270e47919aede4408b6
2023-04-26 20:45:15 +00:00
Martijn Coenen
8a1cdb8e95 Add initial stopped state packages for AOSP products.
AOSP starts with all apps exempt from the stopped state; apps without a
launcher entry aren't stopped by default, and all AOSP apps that do have
a launcher entry are contained in this sysconfig.

Bug: 269129704
Test: Manually inspect
Ignore-AOSP-First: Merge conflict from AOSP to internal master (and this needs to go to UDC, als)
Change-Id: I752f986a210621510f694b3f62bb5c6151db55d6
2023-04-26 19:33:39 +00:00
William Loh
a3e0f4eed3 Add preinstalled-packages-asl-files.xml to base_system.mk
Bug: 276979041
Test: None
Change-Id: I8165f2c33245ef5e652a9fb3dc93711f518dd079
2023-04-26 10:50:49 -07:00
Pranav Gupta
33376577bf Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false
(cherry picked from https://android-review.googlesource.com/q/commit:105610bdf04b12404026e3b52f272688099eda93)
Merged-In: I5937764d8df307ed7547363e6ba2742828779282
Change-Id: I5937764d8df307ed7547363e6ba2742828779282
2023-04-25 00:16:16 +00:00
Treehugger Robot
058e4b2c16 Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" am: d88d79989d am: 34ff715849 am: 33f984ffb4
Original change: https://android-review.googlesource.com/c/platform/build/+/2551676

Change-Id: Ia67e8cfee38a1e9e5d2ca24b99318e65061cee32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 18:27:09 +00:00
Treehugger Robot
34ff715849 Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" am: d88d79989d
Original change: https://android-review.googlesource.com/c/platform/build/+/2551676

Change-Id: Ic0850dc696ffac73aea5667dfc76a3e15f423cd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 16:47:25 +00:00
Treehugger Robot
d88d79989d Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" 2023-04-24 15:55:24 +00:00
Treehugger Robot
b644671ee7 Merge "Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk" am: 4a9b9b4d89 am: 59d4bb4a86 am: 959530c9e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2546591

Change-Id: Ibe29735560d2099e5724bda0a4b6ba4b9273cfcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 15:26:05 +00:00
Treehugger Robot
59d4bb4a86 Merge "Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk" am: 4a9b9b4d89
Original change: https://android-review.googlesource.com/c/platform/build/+/2546591

Change-Id: Iae5c9827880227c5fe2a128050d5410665241f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 13:51:27 +00:00
Roman Kiryanov
d82931f9aa Remove emulator dependencies on non emulator targets (2)
Bug: 111538404
Test: presubmit
Change-Id: Idd55d7f10bc178cfe716d173dbe59d2bed5fd963
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-22 18:07:52 -07:00
Roman Kiryanov
2d9385fd32 Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file
required if TARGET_COPY_OUT_X is set to
`product` or `system_ext`.

Bug: 111538404
Test: presubmit
Change-Id: Ibe7538885cd2f00b8f4340db83be7618a0beee4a
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-22 18:07:30 -07:00
Xin Li
d6b6d0102a Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Change-Id: I900022a8e8f104b6dc52745211c428601be53ba6
2023-04-21 09:49:08 -07:00
Pranav Gupta
105610bdf0 Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false

Change-Id: I5937764d8df307ed7547363e6ba2742828779282
2023-04-20 19:23:35 +00:00
Roman Kiryanov
b645272f3c Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 am: 40e233c6ba am: 8c82f8e5c1
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I00ce7a8263d7e8e704acfbbceeed9efb1591cf6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 08:00:22 +00:00
Roman Kiryanov
8c82f8e5c1 Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 am: 40e233c6ba
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I5835f177be5be2e139758c083d05df46872c66dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 07:17:54 +00:00
Roman Kiryanov
b623cfbe96 Cleanup in emulator_arm64/device.mk
emulator specifies its kernel in device/generic/goldfish

Bug: 111538404
Test: presubmit
Change-Id: I76ab7e5fbb19805f52c2ca4713e11cc544ada905
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-19 13:30:46 -07:00
Florian Mayer
074dce314c Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d am: aca0515f1b
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: Ibd295e9a35a9494fae156090330274173cecab14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 00:42:08 +00:00
Florian Mayer
aca0515f1b Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: I4ea6e13d7297e5b6546475bd55428c1bec6a5fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:55 +00:00
Florian Mayer
ed97847d9a Merge "Include hwasan lib and runtime on arm64 system images" 2023-04-14 23:27:56 +00:00
Florian Mayer
201eb3b6cc Include hwasan lib and runtime on arm64 system images
This is needed so we can run hwasan-enabled apps for debugging on normal
system images.

Bug: 276930343
Change-Id: Ie572d77307e5e6268b851ea5c96aae05d588dae3
2023-04-13 17:39:25 -07:00
Treehugger Robot
e562055a3f Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 am: 825ec3ea87 am: 8bf7d62a34
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: Idfaecac2754edbbb90f276d561f122e7508986f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 21:00:08 +00:00
Treehugger Robot
8bf7d62a34 Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 am: 825ec3ea87
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: I0e856b35ccaa0f175e3990ca28309fe97947b8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:27:56 +00:00
Roman Kiryanov
52b797e741 Remove emulator dependencies on non emulator targets (1)
Bug: 266607613
Bug: 111538404
Test: presubmit
Change-Id: I2c8870d68696f39277a503081c91274b0e9ec1bd
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-10 10:53:25 -07:00
Alex Buynytskyy
e7dc4736dc UpsideDownCake is now 34
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I956555f9e767cca52a410536a9cd832e9f7a0f05
2023-04-09 15:13:20 +00:00
Treehugger Robot
eb081b1f23 Merge "Make android_certificate_directory public" am: 42bc8b9809 am: f2188a7994 am: 2ce394b862
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I102647695618c21ded0c6e694e289bd2c7fef0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 21:33:59 +00:00
Treehugger Robot
2ce394b862 Merge "Make android_certificate_directory public" am: 42bc8b9809 am: f2188a7994
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I00951f29562d13a8fda6a97df96a00232978967a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 21:04:12 +00:00
Cole Faust
b51e1ffce4 Make android_certificate_directory public
This should not be necessary because bp2build should emit a package()
statement with default_visibility = public. However, there appears
to be a problem with bp2build's symlink forest, where it doesn't
handle symlinks correctly.

build/target is a symlink to build/make/target, but in the symlink
forest, build/target is a symlink to the source dir's build/target
instead of to the symlink forest's build/make/target. This means
that when reading this build file via the build/target symlink,
you won't get the bp2build-provided default visibility. (or any other
bp2build generated targets)

We should send a proper fix for this, but in the meantime submit this
quick fix to resolve some failing builds.

Bug: 269577299
Test: lunch bertha_x86_64-userdebug, m nothing
Change-Id: Ia45c7f4a0655b1364b735d6eccf25cad70cad134
2023-04-04 14:09:27 -07:00
Treehugger Robot
645959d878 Merge "Move PRODUCT_BRAND to module_common.mk" am: 70c0c6eb81 am: 4091559a4a am: 7894336346
Original change: https://android-review.googlesource.com/c/platform/build/+/2521235

Change-Id: I5e4fe1300d0a1071fc144cf4693d13fe419cc271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 08:26:19 +00:00
Treehugger Robot
7894336346 Merge "Move PRODUCT_BRAND to module_common.mk" am: 70c0c6eb81 am: 4091559a4a
Original change: https://android-review.googlesource.com/c/platform/build/+/2521235

Change-Id: I0cd8f53371f9fee16e1ede1b46cd55726825fb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 07:57:35 +00:00
Treehugger Robot
70c0c6eb81 Merge "Move PRODUCT_BRAND to module_common.mk" 2023-04-04 07:11:11 +00:00
Cole Faust
0fb15ff3b5 Merge "Add filegroup of certificates" am: d4b4420a14 am: 758b5f0ec1 am: f8dfc30a5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2518216

Change-Id: I002891e2458ea08d22d39912a06266ac856daf64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 05:26:44 +00:00
Cole Faust
f8dfc30a5f Merge "Add filegroup of certificates" am: d4b4420a14 am: 758b5f0ec1
Original change: https://android-review.googlesource.com/c/platform/build/+/2518216

Change-Id: I7131ed35efe0634b4e28fb4a2c8edeb95d2c12b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 04:55:03 +00:00
Cole Faust
d4b4420a14 Merge "Add filegroup of certificates" 2023-04-04 03:58:15 +00:00
Cole Faust
2d42461400 Move PRODUCT_BRAND to module_common.mk
So that we don't need to specify it in individual mainline modules
products, which becomes more important after the internal ones only
inherit from the common aosp product as opposed to the arch-specific
ones.

Bug: 249685973
Test: Diff'd the soong.variables files for the module_* products and saw no differences
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:211c5c2810e50a1c5d3bca2f1f7942b624fe3abe)
Merged-In: If1733eb193cd3748fb3562d09bfd41651e2480f9
Change-Id: If1733eb193cd3748fb3562d09bfd41651e2480f9
2023-04-03 22:19:00 +00:00
Ulya Trofimovich
72ed6869a4 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036 am: 86b1dd2b00 am: 33267272ab
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036

Change-Id: Ie54445d1a99fdb569319c3b31a6d6622f8edb0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 13:08:32 +00:00
Ulya Trofimovich
33267272ab Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036 am: 86b1dd2b00
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036

Change-Id: I76ac0b1cd690b2a019ab0b23bf3b2f01eb6a7fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 12:37:37 +00:00
Ulya Trofimovich
1d3c4ae036 Merge "Revert "Disable dexpreopt for aosp_riscv64"" 2023-04-03 11:31:42 +00:00
Cole Faust
bf65a62cb9 Add filegroup of certificates
This is needed for bazel to depend on all certificates from a different
package.

Bug: 269577299
Test: See other cl
Change-Id: I4eeb0b892400fa6bd90080c7e10e9fb762d3b7db
2023-04-01 14:48:19 -07:00
Gabriel Biren
3d5b1ba95d Merge "Update generic system makefile to use the AIDL Wifi Vendor HAL." into udc-dev 2023-03-31 01:35:32 +00:00
Gabriel Biren
1669b364b5 Update generic system makefile to use the
AIDL Wifi Vendor HAL.

Bug: 274964641
Test: Pre-submit tests
Ignore-AOSP-First: AIDL HAL is not in AOSP yet.
Change-Id: Id4af079389d5adf8380431da01a1d7f36bb1510d
2023-03-30 21:09:43 +00:00
Jiakai Zhang
068c1285f9 Merge "Turn on ART Service." into udc-dev 2023-03-29 16:21:49 +00:00
Treehugger Robot
5e20b3e0a0 Merge "Retire unused variable" am: b722138c8c am: a94bf766c4 am: 2f25fda8d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2509916

Change-Id: I9c253216842ad9fb7ff64762e4ea81f7f68149bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:40:09 +00:00
Treehugger Robot
2f25fda8d1 Merge "Retire unused variable" am: b722138c8c am: a94bf766c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2509916

Change-Id: Ifbd1767c5f51b6ffdb17ee0f4da358a898e74991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:10:27 +00:00
Treehugger Robot
b722138c8c Merge "Retire unused variable" 2023-03-28 19:20:52 +00:00
Treehugger Robot
f7a4d3d3fa Merge "Add the system_dlkm partition to goldfish" am: 7f92721184 am: d75d774230 am: c7edde26db
Original change: https://android-review.googlesource.com/c/platform/build/+/2507155

Change-Id: I30164c8e971677afd65d73d6c58a273a19278cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:35:22 +00:00
Treehugger Robot
c7edde26db Merge "Add the system_dlkm partition to goldfish" am: 7f92721184 am: d75d774230
Original change: https://android-review.googlesource.com/c/platform/build/+/2507155

Change-Id: Ifd700dfe1264070522b8201c87733ca7dbd0fa39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:05:59 +00:00
Treehugger Robot
7f92721184 Merge "Add the system_dlkm partition to goldfish" 2023-03-28 16:11:02 +00:00
Roman Kiryanov
1b292bf89a Retire unused variable
Bug: 274103438
Test: presubmit
Change-Id: I66deda33e8cf5b4bdd00621ede23bc5ad89b6bbb
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-28 08:27:45 -07:00
Ulya Trofimovich
cc5c6a74ee Revert "Disable dexpreopt for aosp_riscv64"
This reverts commit ae7f543b7c.

Reason for revert: Enabling dexpreopt for RISC-V (there is still no
  compiler support, but dex2oat runs in verification mode and does
  not attempt any compilation with https://r.android.com/2510739).

Change-Id: I0a6d0416bec51131f0a54c7ff5b0e194728452b1
2023-03-28 13:15:35 +00:00
Pascal Mütschard
cc5078aba8 Merge "Adds the gpu_counter_producer command." into udc-dev 2023-03-28 12:08:08 +00:00
Roman Kiryanov
8e7f862bce Add the system_dlkm partition to goldfish
required by GKI

Bug: 274103438
Test: atest -c vts_dlkm_partition_test
Change-Id: I0ff1528cf4c79c9604db6302d9a3470e81aae7ee
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-27 11:21:38 -07:00
Pascal Muetschard
eb9dc3e1a0 Adds the gpu_counter_producer command.
This is a small binary that will load a GPU vendor provided shared
library called libgpudataproducer.so, look for the "start" symbol in
that library, and call it. This can be used to start the GPU hardware
counter Perfetto producer that will allow tracing of GPU profiling data
via Perfetto.

Test: manual
Bug: b/273907878
Ignore-AOSP-First: change in topic with internal-first project
Change-Id: I450e159c4d4c323ade90ffa46759239a7bcd4aac
2023-03-27 09:29:04 +00:00
Treehugger Robot
fbc99f283c Merge "Use a better arbitrary target arch for this host-only "device"." am: e07ac36efa am: f9915e1328 am: 68d2e6408d
Original change: https://android-review.googlesource.com/c/platform/build/+/2506000

Change-Id: I9fad5873493c268df198d5526f46b7a00221e98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 23:30:23 +00:00
Treehugger Robot
68d2e6408d Merge "Use a better arbitrary target arch for this host-only "device"." am: e07ac36efa am: f9915e1328
Original change: https://android-review.googlesource.com/c/platform/build/+/2506000

Change-Id: I2d7079d6e84d4b0c41ecf151289c5f5a19b316f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 22:48:26 +00:00
Treehugger Robot
e07ac36efa Merge "Use a better arbitrary target arch for this host-only "device"." 2023-03-24 21:27:15 +00:00
Colin Cross
db6e20d916 Merge changes Id8b48c8c,I3b66304c am: ffda9a5093 am: d0aa18ed07 am: 9ee11cef7c
Original change: https://android-review.googlesource.com/c/platform/build/+/2448666

Change-Id: Icf3be9c7c7b6fb6ba0187a023f4750813250497e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 17:41:03 +00:00
Colin Cross
9ee11cef7c Merge changes Id8b48c8c,I3b66304c am: ffda9a5093 am: d0aa18ed07
Original change: https://android-review.googlesource.com/c/platform/build/+/2448666

Change-Id: I64b731d3f4dc1041c016ec8d460856227bd41e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 16:54:27 +00:00
Colin Cross
ffda9a5093 Merge changes Id8b48c8c,I3b66304c
* changes:
  Build the whole platform for aosp_riscv64
  Disable dexpreopt for aosp_riscv64
2023-03-24 15:48:32 +00:00
Jiakai Zhang
b32ce6f50e Turn on ART Service.
Bug: 272053358
Test: CTS, GTS, Platinum, and full test mapping
  (See http://b/272053358#comment9)
Ignore-AOSP-First: ART Service is a new feature only in internal.
Change-Id: Ide4f81efb021ff05178dd5395fad6091a89cf6da
2023-03-24 10:57:22 +00:00
Colin Cross
ae7f543b7c Disable dexpreopt for aosp_riscv64
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: I3b66304cedf55f734f8aa1d3ad3ed594a7b9a122
2023-03-23 16:29:28 -07:00
Colin Cross
c9cb74d257 Build the whole platform for aosp_riscv64
Remove the hacks that prevent building the rest of the platform
for aosp_riscv64.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: Id8b48c8c456e76624647f153c7dd9612569fc7a1
2023-03-23 16:29:28 -07:00
Peter Collingbourne
283871520b Merge "cuttlefish: Add a fullmte target." am: 3f91ff5d47 am: 0d933e0cc4 am: 7c6db6d1d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2490801

Change-Id: Ieb397d5fe786f5e2f00b64e7af8066a48f509610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 22:52:00 +00:00
Peter Collingbourne
7c6db6d1d6 Merge "cuttlefish: Add a fullmte target." am: 3f91ff5d47 am: 0d933e0cc4
Original change: https://android-review.googlesource.com/c/platform/build/+/2490801

Change-Id: I5fa37befd0619fba3f777aa832fc0b261dd570e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 22:20:56 +00:00
Peter Collingbourne
3f91ff5d47 Merge "cuttlefish: Add a fullmte target." 2023-03-23 21:39:19 +00:00
Treehugger Robot
685c7082bc Merge changes Ie0234187,Iace22e38 am: e042768922 am: aa44c8d68f am: 654bd5065b
Original change: https://android-review.googlesource.com/c/platform/build/+/2500963

Change-Id: Ib7f4f2b88080ee17bc90c70166a2adad566676b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:41:51 +00:00
Treehugger Robot
654bd5065b Merge changes Ie0234187,Iace22e38 am: e042768922 am: aa44c8d68f
Original change: https://android-review.googlesource.com/c/platform/build/+/2500963

Change-Id: Idf93078c8adbc3fd24dad203cc12a278bb3eae7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:46:30 +00:00
Martin Stjernholm
4bbb9744db Use a better arbitrary target arch for this host-only "device".
This "device" is used for linux_bionic builds that may build with
prebuilts (from prebuilts/runtime/mainline and prebuilts/module_sdk) on
master-art and master-art-host. The ndk arch suite was recently
extended to riscv64 (https://r.android.com/2488597), and those
prebuilts don't include that arch, which caused a failure in Soong
(even though target prebuilts aren't actually used here).

Test: lunch armv8-eng
      env DIST_DIR=out/dist ./art/tools/dist_linux_bionic.sh \
        -j80 com.android.art.host
  on master-art
Bug: 274756655
Change-Id: I3e7cdc7dc4ed45ffde4ac139b00d1e9e0148744b
2023-03-23 18:39:54 +00:00
Treehugger Robot
8912bb943c Merge "Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64" am: e57ba5736f am: 2c309f0175 am: e89fa4075a
Original change: https://android-review.googlesource.com/c/platform/build/+/2504717

Change-Id: I21fbd4266e37628ce3ceda53b75ca971f5925d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 10:16:41 +00:00
Treehugger Robot
e89fa4075a Merge "Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64" am: e57ba5736f am: 2c309f0175
Original change: https://android-review.googlesource.com/c/platform/build/+/2504717

Change-Id: I1a398e2f226a26cb5aa1f45f29c612c30d56c445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 09:38:25 +00:00
Roman Kiryanov
6a4773340a Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS
PRODUCT_USE_DYNAMIC_PARTITIONS must be enabled.

Bug: 274103438
Test: presubmit
Change-Id: Ie0234187fd4689211f0d4530f9b96027567273ad
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-22 20:22:35 -07:00
Roman Kiryanov
6715e76360 Retire QEMU_USE_SYSTEM_EXT_PARTITIONS
always enabled

Bug: 274103438
Test: presubmit
Change-Id: Iace22e384976663a8b6e4d1c474c1e2d0f90ec74
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-22 20:22:35 -07:00
Roman Kiryanov
fd5e673f9f Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64
aosp_64bitonly_x86_64 gets broken by the emulator
changes otherwise.

Bug: 274103438
Test: m
Change-Id: I31fed64619e26a1c690a6cf086c644757e45a878
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-22 20:22:21 -07:00
Treehugger Robot
94b2b7a00e Merge "Retire QEMU_DISABLE_AVB" am: e8554eff3a am: 3bd2cb00da am: a509c972f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2500959

Change-Id: I30797b4e2971af785c2a370c5c15cd61b435fdaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:29:40 +00:00
Hsin-Yi Chen
5f09a5b114 Merge "Revert "remove health library from VNDK"" am: 14f240351e am: 4109e2bef4 am: 292b420dcf
Original change: https://android-review.googlesource.com/c/platform/build/+/2499615

Change-Id: I527f9c73a3ec4dbf7d58393fb82f6e24c961b2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:29:29 +00: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
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
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
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
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
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
0a70a53cc9 Merge "Disable frameworks loading of renderscript libs" 2023-03-21 03:27:53 +00:00
Peter Collingbourne
e5373c702c cuttlefish: Add a fullmte target.
Bug: 273575148
Change-Id: I3f6a4a3516a44b44e83a50475fbd820ddd1a2f08
2023-03-16 13:53:29 -07:00
Jiakai Zhang
08cf8f996a Merge "Revert "Turn on ART Service."" into udc-dev 2023-03-16 13:40:28 +00:00
Jiakai Zhang
681222dc11 Revert "Turn on ART Service."
This reverts commit f109ea74c7.

Reason for revert: Broke a lot of things.

Change-Id: If9db83e6b2ac533560e9ab996695619901f29dbf
2023-03-16 13:38:33 +00:00
Jiakai Zhang
4a310a9c8c Merge "Turn on ART Service." into udc-dev 2023-03-15 21:49:05 +00:00
Prashanth Swaminathan
06713a0e89 Disable frameworks loading of renderscript libs
Bug: 206676167
Test: Verified during boot that frameworks skips loading of rs_jni by
injecting logs into frameworks/base/rs.

Change-Id: I856367df816c8ad28dde54af69ab36e4f1605146
2023-03-14 15:52:54 -07:00
Jiakai Zhang
f109ea74c7 Turn on ART Service.
Bug: 272053358
Test: Presubmit
Change-Id: Ief92fd8bc759e674c7fb2fcec71233c0f3c88946
Ignore-AOSP-First: ART Service is a new feature only in internal.
2023-03-14 17:45:53 +00:00
Hsiu-Chang Chen
e3bfab3f9f wlan: Update the path of wpa_supplicant_8_lib am: ba7be1ebca am: 5fb8444e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21809124

Change-Id: Id5aa9a96ffea48590859c14b7c546ef1eb06efd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 05:43:59 +00:00
Hsiu-Chang Chen
5fb8444e85 wlan: Update the path of wpa_supplicant_8_lib am: ba7be1ebca
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21809124

Change-Id: I8752d4947e4549190b2bbb87f4fc3bd78b911dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 05:09:47 +00:00
Hsiu-Chang Chen
ba7be1ebca wlan: Update the path of wpa_supplicant_8_lib
Add the default path back for backward compatibility

Bug: 271240400
Test: Build Pass
Change-Id: I0cbf7d29984bf99a01dbab39df9ff565aa6f0e55
Ignore-AOSP-First: changes in topics with internal-first
2023-03-08 00:40:39 +00:00
Joe Onorato
bcf5b6cb46 Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23 am: a29a46050a am: 3dc4c35514
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830

Change-Id: Id793fd5ebbbcfd8080bcf22a0f2ef9b851ccf119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:42:02 +00:00
Joe Onorato
a29a46050a Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830

Change-Id: I5e369235fae2ca61361873f95712dcb9d2d83570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:02:37 +00:00
Joe Onorato
10bdfb5f23 Merge "Remove OWNERS access for non-build team people to core build system" 2023-02-28 21:27:22 +00:00
Treehugger Robot
397d52d12c Merge "Add libclang_rt.ubsan_standalone to all debug builds" am: 021e31623d
Original change: https://android-review.googlesource.com/c/platform/build/+/2458948

Change-Id: I5ded6c02863415ccf553ddcf4f64cdfebf392d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:04:32 +00:00
Treehugger Robot
021e31623d Merge "Add libclang_rt.ubsan_standalone to all debug builds" 2023-02-28 20:27:48 +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
Erick Alvarez
96791aa830 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 37d0273275 am: e6ff3ed647 am: 4ca5ad6121
Original change: https://android-review.googlesource.com/c/platform/build/+/2458952

Change-Id: I5ed358d2bbf749cb3e961c2713c3db68f602bcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:51:35 +00:00
Erick Alvarez
e6ff3ed647 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 37d0273275
Original change: https://android-review.googlesource.com/c/platform/build/+/2458952

Change-Id: I3f8601eab485d89375640e65afc1e0674feb9bfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 23:19:27 +00:00
Erick Alvarez
2b8cf0e409 Revert "Disable dexpreopt for aosp_riscv64"
This reverts commit e325f61525.

Reason for revert: DroidMonitor-triggered revert due to breakage in some branches.

Bug: 270958097
Change-Id: I2c3bb568c7f3b0dc7a364ea74b91574966102ff3
2023-02-27 20:39:14 +00:00
Florian Mayer
f9d1c1b714 Add libclang_rt.ubsan_standalone to all debug builds
This is needed to run tests that use `sanitize: { undefined: true }`.

(this is a cherry-pick of fc6f2a43af)

Test: run test that needs ubsan on cf_x86_64_phone
      without this change: fails to link
      with this change: works
Bug: 255414852
Merged-In: Id5d3be9bafcc4dbaaf59ca55728ffc40b5cc4af5
Change-Id: Id5d3be9bafcc4dbaaf59ca55728ffc40b5cc4af5
2023-02-27 10:41:53 -08:00
Florian Mayer
2e0e021deb Merge "Add libclang_rt.ubsan_standalone to all debug builds" into udc-dev 2023-02-27 18:38:44 +00:00
Ulya Trofimovich
13a466ff82 Merge "Disable dexpreopt for aosp_riscv64" am: ee254eca0f am: 18a94331ca am: 0b41384361
Original change: https://android-review.googlesource.com/c/platform/build/+/2450642

Change-Id: I2d8752f49a121ea407167d87466142dae806a780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 13:29:54 +00:00
Ulya Trofimovich
18a94331ca Merge "Disable dexpreopt for aosp_riscv64" am: ee254eca0f
Original change: https://android-review.googlesource.com/c/platform/build/+/2450642

Change-Id: I8e96a2f0098577f1bcddadb413ed2f4fc2f33bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 12:15:00 +00:00
Florian Mayer
fc6f2a43af Add libclang_rt.ubsan_standalone to all debug builds
This is needed to run tests that use `sanitize: { undefined: true }`.

Test: run test that needs ubsan on cf_x86_64_phone
      without this change: fails to link
      with this change: works
Bug: 255414852
Change-Id: Id5d3be9bafcc4dbaaf59ca55728ffc40b5cc4af5
2023-02-25 00:17:35 +00:00
Ulya Trafimovich
e325f61525 Disable dexpreopt for aosp_riscv64
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: trehugger
Change-Id: Ib84f1b40675783d286f4ff89d3c1daa9c7be710a
2023-02-24 14:09:10 +00:00
Ulya Trofimovich
d5384aeb89 Merge "Add ART and some other modules to dist target on riscv64." am: b9828d64b4 am: 10f6bf0169 am: 6d38d61ebb
Original change: https://android-review.googlesource.com/c/platform/build/+/2450643

Change-Id: I48c491fdf737499ab7f471f14d69f818ba701380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 20:53:57 +00:00
Ulya Trofimovich
10f6bf0169 Merge "Add ART and some other modules to dist target on riscv64." am: b9828d64b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2450643

Change-Id: I7a93db28dcd6bcc64df2a6e616531e8c343ff68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 19:14:31 +00:00
Ulya Trafimovich
0da6e01bab Add ART and some other modules to dist target on riscv64.
Test: lunch aosp_riscv64-userdebug && m dist
Change-Id: Ib294f30dabeef6cf585ec0e2ad4f51fdfb7f73c4
2023-02-22 13:36:57 +00:00
Cherry Ng
9b56ec1726 Merge "Add preinstallation configs for AOSP Files, Search and Keyboard" into udc-dev 2023-02-22 00:24:24 +00:00
Avichal Rakesh
d21c5ae2d2 Revert "Add DeviceAsWebcam to general handheld_system"
This reverts commit 28b6a02300.

Reason for revert: DeviceAsWebcam is not ready to ship. The target will be re-added once the service is more polished.

Change-Id: I287d352782760427db2a66594e4f69f757ff1fb2
Merged-In: I287d352782760427db2a66594e4f69f757ff1fb2
2023-02-21 19:14:36 +00:00
Treehugger Robot
01a756570b Merge "Add system property for the new boot-after-mainline-update compilation reason." am: 3f6ffaa382
Original change: https://android-review.googlesource.com/c/platform/build/+/2435496

Change-Id: Id550c6d5bdaf8e390cecf6ee1808da7a4ff27b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 12:14:36 +00:00
Cynthia Wasonga
94a52f2017 Add preinstallation configs for AOSP Files, Search and Keyboard
Bug: 238970256
Bug: 267617358
Test: Verify app installation on device
Change-Id: I08d238dfc61571fc9f575e7b72fbee6db418c90c
Merged-In: I08d238dfc61571fc9f575e7b72fbee6db418c90c
2023-02-18 09:27:09 +00:00
Jayant Chowdhary
d925aa7ea2 Merge "Add DeviceAsWebcam to general handheld_system" 2023-02-16 22:59:32 +00:00
Martin Stjernholm
92189ed9b6 Add system property for the new boot-after-mainline-update compilation
reason.

Cherry-picked from internal.

Test: Boot
Bug: 265685704
Change-Id: I11d8d6eac1ea0e9537a839ee39adf3edb51852ec
Merged-In: I11d8d6eac1ea0e9537a839ee39adf3edb51852ec
2023-02-14 18:42:47 +00:00
Ronish Kalia
b1b18d0d4b Merge "Rename healthconnect to healthfitness" 2023-02-14 12:08:47 +00:00
Zhong Dong
05edbf828a Add a new flag to control WallpaperBackup
Test: Locally build android and flashed a debug device.
Bug: 266917524

Change-Id: I418699c5ded8580f105afaf9ec7c3c528dde8939
2023-02-10 08:08:25 +00:00
Daniel Norman
9d240f9d14 Merge "Includes AccessibilityMenu on handheld devices." 2023-02-09 23:05:09 +00:00
ronish
bc566a4e0e Rename healthconnect to healthfitness
Bug: 264516143
Change-Id: I11a359ae23c1990fafb68667988e3249390e47e0
2023-02-07 20:22:36 +00:00
Daniel Norman
72edb1b11d Includes AccessibilityMenu on handheld devices.
In FR b/261252772 we are migrating the AccessibilityMenu accessibility
service from the Android Accessibility Suite into the framework.

This APK is very small (210KB), does not run unless enabled by
the user in accessibility Settings, and uses <150MB PSS while running
per `dumpsys meminfo`.

Bug: 266591148
Test: check that A11yMenu is present in system_ext and can be enabled
      in Settings > Accessibility
Change-Id: I4da09e4f98eb56bcfb441ca1afdeff28f6d3aa31
2023-02-06 22:34:32 +00:00
Avichal Rakesh
28b6a02300 Add DeviceAsWebcam to general handheld_system
DeviceAsWebcam is a new service that lets an Android Device be used as a
UVC webcam. The logic in DeviceAsWebcam is protected behind the vendor
property `ro.usb.uvc.enabled`. Vendors who support UVC will need to set
the property to `true` using something like
```
PRODUCT_VENDOR_PROPERTIES += \
    ro.usb.uvc.enabled?=true
```

Bug: 242344221
Test: Manually tested that the makefile is correctly inherited from.
Change-Id: I9b8444406f1c02fc8b76caee3e961016d9430a0a
2023-02-06 14:18:36 -08:00
Sumedh Sen
d343e2bb19 Merge "Add new xml reference to Android.mk" 2023-01-31 23:20:45 +00:00
Karthik Mahesh
284862a501 Merge "Add ODP system service jar to system server jars list." 2023-01-25 19:35:41 +00:00
Fabián Cañas
86fb70348c Merge "Add binder transaction recording tool to base system debug packages" am: af79d1dede am: 95dded3f87 am: 96d060bb74
Original change: https://android-review.googlesource.com/c/platform/build/+/2393218

Change-Id: I53171882103a5a2016fd7cba2843a66eb526b025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24 19:14:52 +00:00
Fabián Cañas
95dded3f87 Merge "Add binder transaction recording tool to base system debug packages" am: af79d1dede
Original change: https://android-review.googlesource.com/c/platform/build/+/2393218

Change-Id: I97b63a756be4d3f631b4c578f481863a05ab93c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24 16:59:25 +00:00
Fabián Cañas
af79d1dede Merge "Add binder transaction recording tool to base system debug packages" 2023-01-24 16:24:54 +00:00
Karthik Mahesh
e98268fc4f Add ODP system service jar to system server jars list.
Bug: 236174677
Test: TH

Change-Id: Ia999f9a514c32bedef0e6cdd2bba8087290cfe7e
2023-01-23 22:36:58 -08:00
Treehugger Robot
a33a94684b Merge "remove health library from VNDK" am: b8470994b4 am: c7f5895670 am: 7a19a28807
Original change: https://android-review.googlesource.com/c/platform/build/+/2319371

Change-Id: Ibd4f11d53bbaa908dfb00df42325d7069b46c0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24 02:44:41 +00:00
Sumedh Sen
0e592f05df Add new xml reference to Android.mk
Add "initial-package-stopped-states.xml" in Android.mk
for it to be available for SystemConfig to use.

Test: None
Bug: 249514169

Change-Id: I7ea99a285c930d3de93c35deaacc206e37c6aad0
2023-01-23 17:27:26 -08:00
Treehugger Robot
c7f5895670 Merge "remove health library from VNDK" am: b8470994b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2319371

Change-Id: I245141b6bbb91d2d139071d95db8e076fc2e3330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24 01:20:04 +00:00
Jack Wu
dbbe29a15f remove health library from VNDK
Bug: 251425963
Test: build
Change-Id: I368f51bf66e117acee791d3a52eda4bb9b7be411
Signed-off-by: Jack Wu <wjack@google.com>
2023-01-24 00:41:13 +00:00
Bo Hu
043da90fb3 Merge "emulator: do not enforce 8G system image partition" am: 7012508bf5 am: 7624c44f1d am: 50fd1924be
Original change: https://android-review.googlesource.com/c/platform/build/+/2393534

Change-Id: I79f68a7521f9d56b2cbd394193638ebf3a0fd7c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-23 21:42:33 +00:00
Bo Hu
7624c44f1d Merge "emulator: do not enforce 8G system image partition" am: 7012508bf5
Original change: https://android-review.googlesource.com/c/platform/build/+/2393534

Change-Id: Idc41e5f4118c7e7aa0b082ed4031892e8d05e252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-23 19:54:06 +00:00
Fabián Cañas
d8beee09b8 Add binder transaction recording tool to base system debug packages
Test: Make a fresh image. Use and explore with `record_binder`
Change-Id: I4ab24d34c17218b816143864f69819e9ce70e6ae
2023-01-23 14:45:40 -05:00
Bo Hu
7012508bf5 Merge "emulator: do not enforce 8G system image partition" 2023-01-23 18:54:33 +00:00
Treehugger Robot
c8daa6c76e Merge "Add aosp_riscv64 to AndroidProducts for TARGET_BUILD_APPS" am: 96159b063d am: bd2e23ee99 am: 20fd85c38f
Original change: https://android-review.googlesource.com/c/platform/build/+/2393219

Change-Id: I1268ecc1022acd450b21431776f930ee5a090f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 05:17:32 +00:00
Treehugger Robot
bd2e23ee99 Merge "Add aosp_riscv64 to AndroidProducts for TARGET_BUILD_APPS" am: 96159b063d
Original change: https://android-review.googlesource.com/c/platform/build/+/2393219

Change-Id: Ibade628e5d41b8040e4fdd2f0df53d04ab6c38c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 04:19:08 +00:00
Treehugger Robot
96159b063d Merge "Add aosp_riscv64 to AndroidProducts for TARGET_BUILD_APPS" 2023-01-20 03:54:11 +00:00
Motomu Utsumi
7d212c2027 Merge "Remove cronet from PRODUCT_PACKAGES" am: 95bfc2b8f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2248673

Change-Id: I54728244ad739f1dc804a65b194d73d5fa518808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 02:40:05 +00:00
Motomu Utsumi
95bfc2b8f5 Merge "Remove cronet from PRODUCT_PACKAGES" 2023-01-20 02:03:26 +00:00
Colin Cross
4dc7c85153 Add aosp_riscv64 to AndroidProducts for TARGET_BUILD_APPS
Allow building unbundled prebuilts for aosp_riscv64.

Test: TARGET_BUILD_APPS=CtsShim TARGET_PRODUCT=aosp_riscv64 m
Change-Id: If563f2e9b6c0181ad2465367e30bb283bea1fcf9
2023-01-19 14:58:07 -08:00
Patrick Rohr
34c150429a Merge "Remove cronet from PRODUCT_PACKAGES" 2023-01-19 21:37:01 +00:00
Akilesh Kailash
3c0a3b5c94 Merge "Enable Batch writes for OTA installation." am: 529aa12817 am: dbe1b59d3c am: c018013091
Original change: https://android-review.googlesource.com/c/platform/build/+/2372277

Change-Id: Iebaae138fa0a19dea9b056c5cad1ae80e87df362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 02:21:38 +00:00
Akilesh Kailash
dbe1b59d3c Merge "Enable Batch writes for OTA installation." am: 529aa12817
Original change: https://android-review.googlesource.com/c/platform/build/+/2372277

Change-Id: I596aa0c9ed36d4832ad136d814310d7bb253236e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 00:19:50 +00:00
Akilesh Kailash
529aa12817 Merge "Enable Batch writes for OTA installation." 2023-01-18 23:15:34 +00:00
Treehugger Robot
60c73a989d Merge "Fix generic ramdisk build failures on dedicated recovery partitions" am: 2797146c86 am: 621e9cc599 am: 8b33b62d4a
Original change: https://android-review.googlesource.com/c/platform/build/+/2388833

Change-Id: I6374a7bdd6a11396b0c497126db9681b84c31df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 21:20:54 +00:00
Treehugger Robot
621e9cc599 Merge "Fix generic ramdisk build failures on dedicated recovery partitions" am: 2797146c86
Original change: https://android-review.googlesource.com/c/platform/build/+/2388833

Change-Id: Ia3fff9e16c204c846c1600c9cdcb83dc39bac027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 20:24:56 +00:00
Treehugger Robot
2797146c86 Merge "Fix generic ramdisk build failures on dedicated recovery partitions" 2023-01-18 19:25:57 +00:00
Bo Hu
7fb8a697aa emulator: do not enforce 8G system image partition
Only use 8G as default size, when product does not specify
the system image sizes.

Bug: 265440010
Test: build and check sizes

Change-Id: I8da862482600d06eda9b84d0cc5db65f713067b5
2023-01-18 11:09:03 -08:00