Commit Graph

9079 Commits

Author SHA1 Message Date
Treehugger Robot
95ad4d4ba0 Merge "Support dynamic 64-bit drmserver" 2023-05-25 02:22:45 +00:00
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
0dce348046 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 15:35:59 +08: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