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
Alex Buynytskyy
d945acdcc9
Merge "Update Android Studio Version Number." am: ba71daa94e
am: aee2075ece
am: 2831547825
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2568552
Change-Id: I8ff93e5db6b46d6fe07a5474dd226f1230a528e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 21:15:24 +00:00
Peiyong Lin
8f70890d10
Merge "Properly define angle.mk" am: c4c3462f2b
am: 8c97799f15
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2563813
Change-Id: Id6c4057ce22218d6cde18236903c19f158c2fba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 20:26:29 +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
Alex Buynytskyy
2831547825
Merge "Update Android Studio Version Number." am: ba71daa94e
am: aee2075ece
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2568552
Change-Id: Icfe87ba9f29ef7cc168cd62a96a0157f0d672788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 20:25:26 +00:00
Peiyong Lin
c4c3462f2b
Merge "Properly define angle.mk"
2023-04-27 19:53:33 +00:00
Alex Buynytskyy
aee2075ece
Merge "Update Android Studio Version Number." am: ba71daa94e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2568552
Change-Id: I319e3712ed079d0988d9d63f3a00d17a097e0f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 19:26:34 +00:00
Alex Buynytskyy
ba71daa94e
Merge "Update Android Studio Version Number."
2023-04-27 18:27:10 +00:00
Alex Buynytskyy
d873b0e46b
Update Android Studio Version Number.
...
Bug: 275409981
Test: run locally
Change-Id: I0d62ac8178f6d69f66adde8c5889ff86bcfad0ed
2023-04-27 18:18:57 +00:00
Treehugger Robot
9ebe6bdddd
Merge "Let the finalization script create ABI dumps for all architectures" am: 99dc1341d1
am: f8f099a3db
am: e73841dec6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2564374
Change-Id: I4922ad75a0dec05b1a942287b961b2a249f384e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 18:17:22 +00:00
Alex Buynytskyy
83c5505a17
[automerger skipped] Merge "Mark master as VIC development branch." am: d878cdf692
am: 31dd5afd9b
am: 4705c8780e
-s ours
...
am skip reason: Merged-In Idb485846345ea146c04c5ecf6eb4ab6eea122f9b with SHA-1 3ef95f5173
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2564671
Change-Id: Id463021df19cae1cdaa714a138ce9ba5d3d5b738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 18:01:48 +00:00
Daniel Zheng
88918594ea
Merge "Add --max_threads to OTA generation" am: 15c296958b
am: fe2a0816b6
am: ea71ab22cf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2563130
Change-Id: Ie3de224106af5642195f24c3fd96af7319f3eb3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:45:04 +00:00
Yuxin Hu
53d1b235f8
Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" am: e872adfc97
am: a039a3c302
am: 66effe065b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2560175
Change-Id: I8e71212baaf4a53c00894e38de8a68f9ce0512a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:44:44 +00:00
Steven Moreland
e4e7beb794
Merge "remove 32-bit binder req" am: b6040d38fe
am: 8eca4f898e
am: a04627aa38
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2565810
Change-Id: I5104fdc7b4d4dabfdb04d28baaa4c0c9ef9c94e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:36:01 +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
Julien Desprez
e50889f274
Merge "Remove jars from suites that aren't used" am: 283e59bf2d
am: f268c6ddd1
am: 2c5b00fbdd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2563330
Change-Id: I4abada5946d6e4495d35d673c5bd9fe4ad033001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:57:22 +00:00
Treehugger Robot
97deb1a863
Merge "Create new target-files-dir target" am: 428f5d5961
am: c5200cc442
am: 800eb6dfb4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2552714
Change-Id: Ia7171085c73bbb8f1cc20cb7fd19b2b245020d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:51:46 +00:00
Julien Desprez
876df6667f
[automerger skipped] Merge "Remove tradefed-no-fwk from suites" am: aea93408dc
-s ours am: e00048472f
-s ours am: 4b2c8b4626
-s ours
...
am skip reason: Merged-In I672533c475362f4438b5aefc108749be4cfc97df with SHA-1 ca46df5783
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2562812
Change-Id: Ic185149bea50f6ca35598047a30d5c26de16c73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:51:29 +00:00
Julien Desprez
42674a9abe
[automerger skipped] Remove tradefed-no-fwk from suites am: 5fc7314a51
-s ours am: f8111be53c
-s ours am: b12f655ed3
-s ours
...
am skip reason: Merged-In I672533c475362f4438b5aefc108749be4cfc97df with SHA-1 ca46df5783
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2562812
Change-Id: Ica1aa34fb354132d37b53772053c502ecba06df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:51:24 +00:00
Colin Cross
030b5a0d08
[automerger skipped] Merge "Update PLATFORM_VERSION to VP1A" am: 0697b9bb6e
am: e9f67b7fcc
am: c2e5d233d2
-s ours
...
am skip reason: Merged-In Ibc24c10cf040407d79662c1819beaf97da791efb with SHA-1 4d3070c6ee
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2556030
Change-Id: I3fb78ca869e27a14c6822556180186c339a11cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:19 +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
Yuxin Hu
122de57a11
Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" into udc-dev am: 7ea4231664
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22896426
Change-Id: I1fa79d125636726619791c7f9d5972a7d59e3674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:21:53 +00:00
Yuxin Hu
7ea4231664
Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" into udc-dev
2023-04-27 15:36:27 +00:00
Treehugger Robot
e73841dec6
Merge "Let the finalization script create ABI dumps for all architectures" am: 99dc1341d1
am: f8f099a3db
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2564374
Change-Id: Idef6ec538f6b2049d62224fcaa05b2d9f84ea9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 07:11:57 +00:00
Treehugger Robot
f8f099a3db
Merge "Let the finalization script create ABI dumps for all architectures" am: 99dc1341d1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2564374
Change-Id: Ic212e9fc3f4e18aa305c56db5c17e50ef22ffcf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 06:32:25 +00:00
Treehugger Robot
99dc1341d1
Merge "Let the finalization script create ABI dumps for all architectures"
2023-04-27 05:52:25 +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
Alex Buynytskyy
4705c8780e
Merge "Mark master as VIC development branch." am: d878cdf692
am: 31dd5afd9b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2564671
Change-Id: I77217117d0e37b08ca279b3e30294dc511b6a723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 01:13:46 +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
Alex Buynytskyy
31dd5afd9b
Merge "Mark master as VIC development branch." am: d878cdf692
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2564671
Change-Id: I1c028547cf50b02c66099c7f75a38e6738605437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 00:34:01 +00:00
Alex Buynytskyy
d878cdf692
Merge "Mark master as VIC development branch."
2023-04-26 23:39:11 +00:00
Daniel Zheng
ea71ab22cf
Merge "Add --max_threads to OTA generation" am: 15c296958b
am: fe2a0816b6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2563130
Change-Id: Iba93338f4db8ec7f0ac2a623bb55444bc22f448f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 23:06:38 +00:00
Daniel Zheng
fe2a0816b6
Merge "Add --max_threads to OTA generation" am: 15c296958b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2563130
Change-Id: Ibd5d90c7661ecf3367485cf43b887c2cefcde544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 22:27:31 +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
Daniel Zheng
15c296958b
Merge "Add --max_threads to OTA generation"
2023-04-26 21:53:53 +00:00
Yuxin Hu
66effe065b
Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" am: e872adfc97
am: a039a3c302
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2560175
Change-Id: I4b0e6edfca4509f3bb023e2619334486970ed6f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 21:22:45 +00:00
Yuxin Hu
9dfc376c19
Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor
...
This is a change cherry-picked from aosp:
https://r.android.com/2560175
Merged-In: I0fb881962ab77abd18f05d33393c4ee11694109c
Bug: b/270994705
Test: m -j45; flash and check Pixel 7 boots fine
atest CtsAngleIntegrationHostTestCases
Change-Id: I4632ff64bc26623c796b992a71761a754149955a
2023-04-26 21:02:13 +00:00
Yuxin Hu
a039a3c302
Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" am: e872adfc97
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2560175
Change-Id: I1e7925c2d5aa4e4891df0f7991dedb0ff11f89aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 20:45:35 +00:00
Yuxin Hu
e872adfc97
Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor"
2023-04-26 20:03:58 +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
Steven Moreland
a04627aa38
Merge "remove 32-bit binder req" am: b6040d38fe
am: 8eca4f898e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2565810
Change-Id: I927af1a1e58748ff6fc5d1949b286c4d26c0352d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 18:29:09 +00:00
Alex Buynytskyy
0fc39526a1
Mark master as VIC development branch.
...
Test: ./build-step-1-and-m.sh
Bug: 279615150
Change-Id: Idb485846345ea146c04c5ecf6eb4ab6eea122f9b
Merged-In: Idb485846345ea146c04c5ecf6eb4ab6eea122f9b
2023-04-26 18:15:59 +00:00
Alex Buynytskyy
3391f02a4f
[automerger skipped] Mark udc-dev as finalized branch. am: 44395a8138
-s ours
...
am skip reason: skipped by user alexbuy
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22880992
Change-Id: I3b3e701ad17c247a2ccf8a40df57e1ef319f05ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 18:14:08 +00:00
Alex Buynytskyy
3ef95f5173
Mark master as VIC development branch.
...
Test: ./build-step-1-and-m.sh
Bug: 279615150
Change-Id: Idb485846345ea146c04c5ecf6eb4ab6eea122f9b
(cherry picked from commit 576ca9f162
)
2023-04-26 17:59:28 +00:00
Daniel Zheng
a30989bafa
Add --max_threads to OTA generation
...
Adding an option to configure max number of threads used during
ota_from_target_files
Bug: 277794445
Test: tested ota_from_target_files
Change-Id: I9bae92ee43c21926434ab04563a2b4f0678b73eb
2023-04-26 10:52:12 -07: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
Steven Moreland
8eca4f898e
Merge "remove 32-bit binder req" am: b6040d38fe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2565810
Change-Id: I1e2f58d013b3b18de045dbaf122b09a2f3b46c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 17:48:07 +00:00
Steven Moreland
b6040d38fe
Merge "remove 32-bit binder req"
2023-04-26 17:00:01 +00:00
Steven Moreland
03a11ff1c3
remove 32-bit binder req
...
Now that this value is no longer being read by
libbinder, I'm doing the following to remove
it from the build:
1. this CL (remove requirement)
2. removing the config from all devices
3. removing config from the build + kati obsolete
Bug: 232423610
Test: build, boot
Change-Id: I77fcd14c273b43bd10430a55e91e1d5accc9efd0
2023-04-26 16:48:52 +00:00
Julien Desprez
2c5b00fbdd
Merge "Remove jars from suites that aren't used" am: 283e59bf2d
am: f268c6ddd1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2563330
Change-Id: I193830ac1ab4620a0bbb465ee3b6f85b463def7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 16:43:54 +00:00