Commit Graph

8595 Commits

Author SHA1 Message Date
Treehugger Robot
e80e8b4c5c Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a am: 7613afc5ae am: 1b805513cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I4dad5a6ab484b68f53f1636634a7d98ea6073963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 00:47:10 +00:00
Treehugger Robot
7613afc5ae Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I62ffc6c79b1b472e3a25c3b80f88ef26f3507ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 23:32:09 +00:00
Treehugger Robot
a85c8a863a Merge "BOARD_VNDK_VERSION must be set first pass" 2023-06-08 23:19:34 +00:00
Steven Moreland
78549acb47 BOARD_VNDK_VERSION must be set first pass
Removing all places that consider that this might not be
set.

Bug: 122954981
Test: build
Change-Id: I62107d041410f4ee1d3652e394ed5e7688c12f25
2023-06-07 20:57:38 +00:00
Seigo Nonaka
c874637cfa Merge "Include RobotoFlex into AOSP system image" am: 52b65fef51 am: 7017c9a918 am: c6b25f39d9
Original change: https://android-review.googlesource.com/c/platform/build/+/2606566

Change-Id: I9364f24d5e246f957506fec88ed6cd699987adf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 04:39:47 +00:00
Seigo Nonaka
7017c9a918 Merge "Include RobotoFlex into AOSP system image" am: 52b65fef51
Original change: https://android-review.googlesource.com/c/platform/build/+/2606566

Change-Id: I0274fbe39d7b6f19c486e22a62f79f203187052a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:52:15 +00:00
Seigo Nonaka
52b65fef51 Merge "Include RobotoFlex into AOSP system image" 2023-06-07 02:14:27 +00:00
Treehugger Robot
86c394f1c1 Merge "Do not include SoundPicker on Android TV" am: 05e0a133aa am: 2939790301 am: 14396e5797
Original change: https://android-review.googlesource.com/c/platform/build/+/2604845

Change-Id: Ie69e19ee9d958f73303753aba85ed135a6255a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 01:41:14 +00:00
Treehugger Robot
2939790301 Merge "Do not include SoundPicker on Android TV" am: 05e0a133aa
Original change: https://android-review.googlesource.com/c/platform/build/+/2604845

Change-Id: If5f51e4e7f5e0eea972d8c87790afdd209c1f6de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 00:05:17 +00:00
Treehugger Robot
05e0a133aa Merge "Do not include SoundPicker on Android TV" 2023-05-31 23:21:43 +00:00
Treehugger Robot
b39f4821b9 Merge "Enable UFFD GC." am: 4f6a18d4cf am: c7f4692afa am: f7fc3bf28d
Original change: https://android-review.googlesource.com/c/platform/build/+/2607296

Change-Id: Ib379008d9e6ec231c8bfbad65ddfecd6a117b923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 17:48:57 +00:00
Treehugger Robot
c7f4692afa Merge "Enable UFFD GC." am: 4f6a18d4cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2607296

Change-Id: Id6580ac9655505ed945d0903ed9ecfa34b6a7c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 14:36:36 +00:00
Jiakai Zhang
117212e422 Enable UFFD GC.
Bug: 160737021
Change-Id: Ic19c8764087607338963b0e5d351ff14f536dd20
Test: Presbumit
2023-05-30 15:22:40 +00:00
Seigo Nonaka
1260450745 Include RobotoFlex into AOSP system image
Bug: 235303866
Test: Manually done
Change-Id: I8ff5ef9441b8103d87bd4eb575e5abe87a2750c1
2023-05-29 17:49:20 +09:00
Nikolas Havrikov
15ba4a9bc6 Do not include SoundPicker on Android TV
This CL leverages the PRODUCT_IS_ATV build time variable to selectively
exclude the SoundPicker package from the PRODUCT_PACKAGES. This also
paves the way to approach the removal of other unused packages from TV.

Bug: 276897441
Test: make
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:413b614d0d7bc1b412c87672f995fabfadbb6bc8)
Merged-In: Ifb25c1f26df545d31fb80f8e43c217fa8806e021
Change-Id: Ifb25c1f26df545d31fb80f8e43c217fa8806e021
2023-05-25 09:00:18 +00:00
Treehugger Robot
173bfad7c9 Merge "Support dynamic 64-bit drmserver" am: 95ad4d4ba0 am: 6c716889f9 am: 979255934c
Original change: https://android-review.googlesource.com/c/platform/build/+/2588496

Change-Id: Ic7cde71f181a5b437d77e28e07147fd73978dc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 03:50:01 +00:00
Treehugger Robot
6c716889f9 Merge "Support dynamic 64-bit drmserver" am: 95ad4d4ba0
Original change: https://android-review.googlesource.com/c/platform/build/+/2588496

Change-Id: I05f061809b34064602aaec04e3403890f8b7c739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 02:46:47 +00:00
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
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