Commit Graph

31998 Commits

Author SHA1 Message Date
Treehugger Robot
ec4e699101 Merge "Output system_dlkm.img to dist folder" am: 2a8587c729 am: 25985f1fc2
Original change: https://android-review.googlesource.com/c/platform/development/+/2019975

Change-Id: I046b786283138e076508d0efd8b43e0309df849d
2022-03-10 11:36:12 +00:00
Treehugger Robot
25985f1fc2 Merge "Output system_dlkm.img to dist folder" am: 2a8587c729
Original change: https://android-review.googlesource.com/c/platform/development/+/2019975

Change-Id: I0cc92f3e96254ef584c629dcf95a1c0e33350cbb
2022-03-10 11:12:45 +00:00
Treehugger Robot
2a8587c729 Merge "Output system_dlkm.img to dist folder" 2022-03-10 10:46:46 +00:00
SzuWei Lin
20a24006ec Output system_dlkm.img to dist folder
Bug: 223726390
Test: TH
Change-Id: I7a03162dfb7770381c8465a279379b3fa5dfed84
2022-03-10 17:34:14 +08:00
Treehugger Robot
0ef7a0ca03 Merge "Add install_in_root property to VSDK generated Android.bp." am: ffdc3be22a am: 15251d849c
Original change: https://android-review.googlesource.com/c/platform/development/+/2012417

Change-Id: Ica740286d631391a7c47afa3d1c6100240fc8d14
2022-03-08 18:02:20 +00:00
Treehugger Robot
15251d849c Merge "Add install_in_root property to VSDK generated Android.bp." am: ffdc3be22a
Original change: https://android-review.googlesource.com/c/platform/development/+/2012417

Change-Id: I09a8f0c2c9a033fe36b0ec9438a8a8b1aa78d9dc
2022-03-08 17:37:43 +00:00
Treehugger Robot
ffdc3be22a Merge "Add install_in_root property to VSDK generated Android.bp." 2022-03-08 17:10:54 +00:00
Xin Li
09fcb1673a [automerger skipped] Merge "Merge Android 12L" am: f8d6bfd1b9 -s ours am: e7c4955805 -s ours
am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: I2e49601360d9c093ed1dbbcf24452529a5b858cf
2022-03-08 11:06:54 +00:00
Xin Li
67a21794bf [automerger skipped] Merge Android 12L am: dbe0f25851 -s ours am: c4c2173037 -s ours
am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: I6f5c78bc7c74e21061d61ec96b24ab8ce890a46e
2022-03-08 11:03:58 +00:00
Xin Li
e7c4955805 [automerger skipped] Merge "Merge Android 12L" am: f8d6bfd1b9 -s ours
am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: Ib81de7f10430f79d203fd8129633b36689930e47
2022-03-08 10:22:05 +00:00
Xin Li
c4c2173037 [automerger skipped] Merge Android 12L am: dbe0f25851 -s ours
am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: I0f3d40fc9b2d3b865635b0b27f37b9d6f04d1aae
2022-03-08 10:19:07 +00:00
Xin Li
f8d6bfd1b9 Merge "Merge Android 12L" 2022-03-08 06:53:24 +00:00
Xin Li
dbe0f25851 Merge Android 12L
Bug: 222710654
Merged-In: I513aa15f5d655ac3fbb535797659d3654ccfec5e
Change-Id: I0e4553be8788fcb5ca9e9d534ed47ac82b52a427
2022-03-08 00:14:10 +00:00
Jose Galmes
bfe4ade31f Add install_in_root property to VSDK generated Android.bp.
Bug: 215295121
Test: Install VSDK and verify install_in_root property is present in generated Android.bp
Change-Id: Ib1215de833c9ced436911ffeb3052fcea12bf648
2022-03-07 14:51:30 -08:00
Ivan Lozano
aa8896e518 Merge "Exclude additional rust_tests." am: 7abb3b9ee4 am: bf674ec373
Original change: https://android-review.googlesource.com/c/platform/development/+/2007021

Change-Id: I4a9df5313ed5713bae9b28e0b11d66bf47564f41
2022-03-04 22:02:44 +00:00
Ivan Lozano
bf674ec373 Merge "Exclude additional rust_tests." am: 7abb3b9ee4
Original change: https://android-review.googlesource.com/c/platform/development/+/2007021

Change-Id: I513aa15f5d655ac3fbb535797659d3654ccfec5e
2022-03-04 21:38:34 +00:00
Ivan Lozano
7abb3b9ee4 Merge "Exclude additional rust_tests." 2022-03-04 21:11:19 +00:00
Ivan Lozano
69030b3994 Exclude additional rust_tests.
aidl_test_rust_service_async is a helper binary and shouldn't be added
to TEST_MAPPINGs. diced_client_test does not work in presubmit yet.

Test: update_crate_tests.py no longer adds those tests.
Change-Id: I565680d2bee31e30bf5db224c46428385ed279a3
2022-03-04 14:24:24 -05:00
Treehugger Robot
2739b2ab52 Merge "Move comment to license_note" am: 60bd102826 am: e9574727d4
Original change: https://android-review.googlesource.com/c/platform/development/+/2007325

Change-Id: I79c1786377f9f4c7b3812cafe1439d96475d19b7
2022-03-04 04:07:19 +00:00
Treehugger Robot
e9574727d4 Merge "Move comment to license_note" am: 60bd102826
Original change: https://android-review.googlesource.com/c/platform/development/+/2007325

Change-Id: If09347695a9ff998bfe13ad25af8a219306297e1
2022-03-04 03:44:01 +00:00
Peter Collingbourne
f8364fbd2d Merge "gdbclient.py: Implement --chroot argument." am: d623312d9e am: 42b09a2fd3
Original change: https://android-review.googlesource.com/c/platform/development/+/2007871

Change-Id: I9d3d2afbd0e7ef05e17f852e1f2eb4baa7c493e1
2022-03-04 03:23:20 +00:00
Treehugger Robot
60bd102826 Merge "Move comment to license_note" 2022-03-04 03:14:06 +00:00
Peter Collingbourne
42b09a2fd3 Merge "gdbclient.py: Implement --chroot argument." am: d623312d9e
Original change: https://android-review.googlesource.com/c/platform/development/+/2007871

Change-Id: I9452a1f8ac6b6362ce31cae15bf2498d35b88dd8
2022-03-04 03:01:04 +00:00
Peter Collingbourne
d623312d9e Merge "gdbclient.py: Implement --chroot argument." 2022-03-04 02:36:30 +00:00
Bob Badour
8922d59324 Move comment to license_note
Comments not preserved during refresh.

Test: m nothing
Change-Id: Ieb8c4aa24e1f35f2b53ee1c497601269c238bdbe
2022-03-03 14:50:46 -08:00
Peter Collingbourne
ba5482675f gdbclient.py: Implement --chroot argument.
This allows executables to be debugged inside a chroot (such as the ART
testing chroot).

Change-Id: I1b790c3c2307e240d37ed0afb9a930d00957acec
2022-03-03 12:33:26 -08:00
Treehugger Robot
9f00719873 Merge "Bumping package version number for next release" am: 5643e1287f am: ff0db2c6df
Original change: https://android-review.googlesource.com/c/platform/development/+/2004902

Change-Id: I8a0c69516801aaca0b1273eae9e1752cb20cb861
2022-03-03 01:58:21 +00:00
Treehugger Robot
ff0db2c6df Merge "Bumping package version number for next release" am: 5643e1287f
Original change: https://android-review.googlesource.com/c/platform/development/+/2004902

Change-Id: If75fbbd5fee9209a872bda13c15a3bd03a7d172c
2022-03-03 01:35:08 +00:00
Treehugger Robot
5643e1287f Merge "Bumping package version number for next release" 2022-03-03 01:10:29 +00:00
Raju Kulkarni
60b7ecc944 Bumping package version number for next release
Bug: 222358562
Change-Id: Ifcbbc913cf01e9823edd43c6c99684738608d361
Test: N/A
2022-03-02 23:58:28 +00:00
Hector Dearman
f08642b355 Merge "Stop including systrace in platform tools" am: 03f2a0c5e6 am: 451e52f8bb
Original change: https://android-review.googlesource.com/c/platform/development/+/1914938

Change-Id: Ie0743a33b49555226b637ae16d592403f6108b8a
2022-02-28 10:37:18 +00:00
Hector Dearman
451e52f8bb Merge "Stop including systrace in platform tools" am: 03f2a0c5e6
Original change: https://android-review.googlesource.com/c/platform/development/+/1914938

Change-Id: Ie59d12408078f001dede43661bb1c67712a5b7a6
2022-02-28 10:16:09 +00:00
Hector Dearman
03f2a0c5e6 Merge "Stop including systrace in platform tools" 2022-02-28 09:55:06 +00:00
Howard Chen
87bba84dbc Merge "Add script to update the 5.15 kernel build chaining" am: 186e40dc54 am: 8a55e97d3b
Original change: https://android-review.googlesource.com/c/platform/development/+/1993723

Change-Id: I530817a9efac30a5fdb1b5832608b0cef1286a0a
2022-02-24 05:23:15 +00:00
Howard Chen
8a55e97d3b Merge "Add script to update the 5.15 kernel build chaining" am: 186e40dc54
Original change: https://android-review.googlesource.com/c/platform/development/+/1993723

Change-Id: I52cb2e4d58d60320e1fba2cb91512263387ff62f
2022-02-24 04:58:39 +00:00
Howard Chen
186e40dc54 Merge "Add script to update the 5.15 kernel build chaining" 2022-02-24 04:28:38 +00:00
Howard Chen
2b79b9da13 Add script to update the 5.15 kernel build chaining
This is for the aos-master-boot branch to support
android13-5.15 development.

Bug: 198363484
Bug: 216409649
Test: \
  ./development/gsi/build_with_kernel/fetch_kernels.sh \
  ./development/gsi/build_with_kernel/repack_kernels.sh \
  ./development/gsi/build_with_kernel/update_kernel_prebuilts_515_arm64.sh

Change-Id: Ieadd5a0f8cc6a3e4b654973b2b8844dee2ec0763
2022-02-22 17:43:33 +08:00
Treehugger Robot
d5fb51ce45 Merge "Add logging for Ethernet callbacks." am: d950d19bd4 am: b8d7f1ae27
Original change: https://android-review.googlesource.com/c/platform/development/+/1977694

Change-Id: Ia6dbb9edf1f2fe2003c09d7f003ed145b59609c0
2022-02-15 12:03:26 +00:00
Treehugger Robot
b8d7f1ae27 Merge "Add logging for Ethernet callbacks." am: d950d19bd4
Original change: https://android-review.googlesource.com/c/platform/development/+/1977694

Change-Id: I994c9d9062c229775d3e6caca343440af830862e
2022-02-15 11:39:12 +00:00
Treehugger Robot
d950d19bd4 Merge "Add logging for Ethernet callbacks." 2022-02-15 10:33:26 +00:00
Xin Li
e925789510 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: c081864bf3 -s ours
am skip reason: Merged-In I9b94d270148d8ce5fa97f88f460d8c03eac3873c with SHA-1 ca9f9f2266 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16844362

Change-Id: I371d6ed9284634f888d6a38eee81385976c6d4fe
2022-02-14 18:03:39 +00:00
Xin Li
c081864bf3 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I9b94d270148d8ce5fa97f88f460d8c03eac3873c
Change-Id: I34852886e6e98d2964318d6fcc6ebd7292e47544
2022-02-11 06:56:24 +00:00
Treehugger Robot
6b71638c93 Merge changes Ic4afb996,I9792e14a am: b4b43a5209 am: ed19a49dbf am: 1cbff04130
Original change: https://android-review.googlesource.com/c/platform/development/+/1977839

Change-Id: I746483a5b23f1c64e8670c430fef105599437a5d
2022-02-10 03:11:01 +00:00
Lorenzo Colitti
fa83a254da Add logging for Ethernet callbacks.
Test: manual
Change-Id: I2fc92895ec59f616715673d3141fc0fb19f7585b
2022-02-10 11:57:47 +09:00
Treehugger Robot
1cbff04130 Merge changes Ic4afb996,I9792e14a am: b4b43a5209 am: ed19a49dbf
Original change: https://android-review.googlesource.com/c/platform/development/+/1977839

Change-Id: I28c211d98ce41c9fcac2b793f3fa225207177305
2022-02-10 02:56:00 +00:00
Treehugger Robot
ed19a49dbf Merge changes Ic4afb996,I9792e14a am: b4b43a5209
Original change: https://android-review.googlesource.com/c/platform/development/+/1977839

Change-Id: I0ec9a64a77a2c0c2712294724d458cf920d9abae
2022-02-10 02:28:58 +00:00
Treehugger Robot
b4b43a5209 Merge changes Ic4afb996,I9792e14a
* changes:
  Update OWNERS to go/ab/clang-tools build scripts
  Update clang-tools build to clang-r445002
2022-02-10 02:11:41 +00:00
Pirama Arumuga Nainar
5601077c12 Update OWNERS to go/ab/clang-tools build scripts
So it's easier for the LLVM toolchain team to maintain them.

Test: N/A
Change-Id: Ic4afb996a5c262cb233774cd4bbe114f0fe69663
2022-02-09 11:50:56 -08:00
Pirama Arumuga Nainar
ba7dc83be5 Update clang-tools build to clang-r445002
Bug: http://b/214080353

Test: prebuilts/clang-tools/build-prebuilts.sh
Change-Id: I9792e14a3c20c4b11d0572c18f7da52a4c5b3f6a
2022-02-09 11:45:08 -08:00
Matthew Maurer
727fa57866 Merge "Add Rust bindgen tool to clang-tools." am: f123c15764 am: a30f4207e5 am: 590e9d0207
Original change: https://android-review.googlesource.com/c/platform/development/+/1975567

Change-Id: I61255de94aaa2306c1c220efe949eab16649e6ba
2022-02-09 17:02:18 +00:00