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
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
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
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
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
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
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
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
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
Lorenzo Colitti
fa83a254da
Add logging for Ethernet callbacks.
...
Test: manual
Change-Id: I2fc92895ec59f616715673d3141fc0fb19f7585b
2022-02-10 11:57:47 +09: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
a30f4207e5
Merge "Add Rust bindgen tool to clang-tools." am: f123c15764
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1975567
Change-Id: I61548332cead11c305aeabd56e6429d8a2a44a4a
2022-02-09 16:29:23 +00:00
Matthew Maurer
f123c15764
Merge "Add Rust bindgen tool to clang-tools."
2022-02-09 16:16:44 +00:00
Thiébaud Weksteen
65ba5606c1
Merge "Require cargo_bin option" am: 9f75e2c9bc
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1977686
Change-Id: Iabc45c1ec01e7a90adbc91322b3ed5673585c96a
2022-02-09 04:32:50 +00:00
Thiébaud Weksteen
9f75e2c9bc
Merge "Require cargo_bin option"
2022-02-09 04:15:14 +00:00
Thiébaud Weksteen
d5d033979f
Require cargo_bin option
...
The prebuilt cargo (or more precisely, its libstd) cannot be used when
running cargo2android.py. Ensure that the upstream cargo binary is used.
This is automatically set when using the sandbox for Googlers. For
external contributors, raise an error if the option is not provided.
Test: As a googler, execute cargo2android.py directly; an error is
raised.
Test: As a googler, use the sandbox; cargo2android.py is executed
correctly.
Test: As an external contributor, execute cargo2android.py; an error is
raised if cargo_bin is not provided.
Bug: 217810523
Change-Id: Id42ba777b3960b13f6ef91d36eaad94df939f48e
2022-02-09 11:25:15 +11:00
Matthew Maurer
3c4124eda2
Add Rust bindgen tool to clang-tools.
...
Bug: 160803703
Change-Id: Ic895ef1e010c2938ffed5d33f5fca4153f459c14
2022-02-07 23:34:14 +00:00
Rob Seymour
792682ada2
Merge "Add root directory when copying owner file." am: 1b1e747351
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1971199
Change-Id: I86a381176e9f7296bd94e0cb34ca70d525e69062
2022-02-04 00:26:30 +00:00
Rob Seymour
1b1e747351
Merge "Add root directory when copying owner file."
2022-02-04 00:08:42 +00:00
Rob Seymour
2ff1e6fc78
Add root directory when copying owner file.
...
Owner file is copied after changing to the install directory.
Capture the root directory before changing directory and add to copy_owners.
Test: python3 development/vndk/snapshot/update.py ..
Bug: 214089693
Change-Id: I82e79441bdec4638002a00aaeef4ec107b180427
2022-02-03 16:22:10 +00:00
Raju Kulkarni
25e765a8f6
Merge "Bumping version number for next release of Platform tools Bug: 217422919 Test: N/A" am: 847b63f48d
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1965728
Change-Id: I7a8779016e85ea20da3f34e3f92eee71fc6ea1b5
2022-02-01 23:43:46 +00:00
Raju Kulkarni
847b63f48d
Merge "Bumping version number for next release of Platform tools Bug: 217422919 Test: N/A"
2022-02-01 23:29:34 +00:00
Raju Kulkarni
a3936668b9
Bumping version number for next release of Platform tools
...
Bug: 217422919
Test: N/A
Change-Id: I34f122c49eb90e7bff053bf240bc7318219049ad
2022-02-01 21:40:35 +00:00
Christopher Ferris
dc290141fd
Merge "Fix exception when path not found." am: 39e706e507
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1960330
Change-Id: I17048ce8703293c07d9110db1e935b0d19594531
2022-01-26 18:14:33 +00:00
Christopher Ferris
39e706e507
Merge "Fix exception when path not found."
2022-01-26 18:01:37 +00:00
Christopher Ferris
27bee5adfa
Fix exception when path not found.
...
Add a default return value in a call in the GetLibraryByBuildId()
function to avoid an exception if a file cannot be found in the
symbol directory.
Bug: 216232380
Test: Ran the input from the bug. Verified without the change, the
Test: exception occurs and with the fix, no exception.
Test: Ran unit tests of stack_core.py.
Change-Id: I015982eb835f5a3d7f03dcc3e0b1627b0c1a7cfe
2022-01-25 13:10:24 -08:00
Bob Badour
b375f76135
Merge "Fix license texts." am: 632da0a501
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1955284
Change-Id: Ic02e981ac8401733782d30810c7bcb15291ff668
2022-01-21 19:10:38 +00:00
Bob Badour
632da0a501
Merge "Fix license texts."
2022-01-21 18:47:26 +00:00
Bob Badour
082705bfb3
Fix license texts.
...
Push specific licenses down the tree toward the leaf directories.
Remove extra Apache 2.0 license texts--just use Android-Apache-2.0
Test: m nothing
Change-Id: Ibee25f75f5933699d6f43acdc192b2ada6823757
2022-01-20 19:04:52 +00:00
Treehugger Robot
2f10578152
Merge "idegen: traversing all vendor-specific excludes" am: c65b20e6b6
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1264719
Change-Id: Ia890321a3e249c29b3f2f8a39b4fe797fca39b1f
2022-01-17 13:12:16 +00:00
Treehugger Robot
c65b20e6b6
Merge "idegen: traversing all vendor-specific excludes"
2022-01-17 12:55:14 +00:00
Treehugger Robot
d91578e406
Merge "Remove self from OWNERS" am: 6bcf0f0530 am: b55d64fe61 am: f2e42d05e8
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1939253
Change-Id: I55245e95725b3802326e8140f4ca5f9fab2b8d52
2022-01-12 02:23:31 +00:00