Treehugger Robot
00798ab5c8
Merge "Add install_in_root property to VSDK generated Android.bp." am: ffdc3be22a am: 15251d849c am: 0ef7a0ca03
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2012417
Change-Id: I703a1558910b2005af75f7aab0a0319f29613c92
2022-03-09 10:49:10 +00:00
Xin Li
d6358500cb
[automerger skipped] Merge "Merge Android 12L" am: f8d6bfd1b9 -s ours am: e7c4955805 -s ours am: 09fcb1673a -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: I57a488c71a52a222b93cffec3e0ef02434d13309
2022-03-09 10:05:22 +00:00
Xin Li
74b884f583
[automerger skipped] Merge Android 12L am: dbe0f25851 -s ours am: c4c2173037 -s ours am: 67a21794bf -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: I38cd1f2aa4fbc5bd129710692e642286636abcf1
2022-03-09 10:02:28 +00: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
e65cd9e1cb
Merge "Exclude additional rust_tests." am: 7abb3b9ee4 am: bf674ec373 am: aa8896e518
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2007021
Change-Id: I8b9b1f603b922a8fda4ee01a9e37034e73ecd380
2022-03-04 22:23:12 +00: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
aa52c9123c
Merge "Move comment to license_note" am: 60bd102826 am: e9574727d4 am: 2739b2ab52
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2007325
Change-Id: I6c39aca1df23368611a754eef3be4dfe3d35a4fe
2022-03-04 04:30:08 +00: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
Peter Collingbourne
5785b7e791
Merge "gdbclient.py: Implement --chroot argument." am: d623312d9e am: 42b09a2fd3 am: f8364fbd2d
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2007871
Change-Id: I109323b63ce853fd73268f71d4e35b951e42f0b9
2022-03-04 03:44:23 +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
feeeed7347
Merge "Bumping package version number for next release" am: 5643e1287f am: ff0db2c6df am: 9f00719873
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2004902
Change-Id: I8227132fe9c8b7862f58b3d7c34a718d6c11c3cc
2022-03-03 02:21:07 +00: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
e5d692bd20
Merge "Stop including systrace in platform tools" am: 03f2a0c5e6 am: 451e52f8bb am: f08642b355
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1914938
Change-Id: Ifdbfca47ba029a56015062c8ff7cd54282d2c070
2022-02-28 10:59:30 +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
c5c6852649
Merge "Add script to update the 5.15 kernel build chaining" am: 186e40dc54 am: 8a55e97d3b am: 87bba84dbc
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1993723
Change-Id: I490f453f5be1d99fa1ea41984d564f62409a8436
2022-02-24 05:46:29 +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
Vishnu Nair
fe1da96bfb
Winscope: Introduce ProxyClient class
...
Use new class to share device auth states, adb proxy
state and expose functions to talk to proxy.
This is the first step before adding new functionality to
winscope that will convert transaction traces to
layer traces. This functionality needs to be added in
DataInput.vue so this class will make it easier to read
the proxy state and use the proxy.
There should be no functional change in this cl.
Test: collect winscope traces via proxy
Bug: 200284593
Change-Id: Ic1f492ebec6c8dfd667d0828bb2d6779665b89c2
Merged-In: Ic1f492ebec6c8dfd667d0828bb2d6779665b89c2
(cherry picked from commit f89a0fbaa9 )
2022-02-23 21:46:37 +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
Neha Jain
b2c12811b0
Update API 33 release config and emulator files for TM DP 2
...
Bug: 220062578
Change-Id: Icd206d445e3f00eb5e9670ce148a097d7638ddc7
2022-02-17 06:33:19 +00:00
Hongwei Wang
0452614c21
Merge "Add demo for content PiP"
2022-02-16 20:00:07 +00:00
Treehugger Robot
9c579190c5
Merge "Add logging for Ethernet callbacks." am: d950d19bd4 am: b8d7f1ae27 am: d5fb51ce45
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1977694
Change-Id: Ie2e338913e545b356768833a79562a81691529d1
2022-02-15 12:19:19 +00: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
9e70cef7a3
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: c081864bf3 -s ours am: e925789510 -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: Id9eba9338dea3f3cc79ad48e450025af4fd1db1c
2022-02-14 18:21:02 +00:00