Commit Graph

33882 Commits

Author SHA1 Message Date
Treehugger Robot
864082db3d Merge changes I3e156afa,Id7e4f2eb am: 116fa3048f
Original change: https://android-review.googlesource.com/c/platform/development/+/2513461

Change-Id: I720e1e647d3d4f1064f3759bafe7ebb8deb57ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:18:50 +00:00
Treehugger Robot
210fc28fcf Merge "Utilize from-text stub module in build" am: 43ff63a864
Original change: https://android-review.googlesource.com/c/platform/development/+/2465411

Change-Id: I487653a3dc12e05b3b23bedc4187da765d4c9dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:15:28 +00:00
Treehugger Robot
116fa3048f Merge changes I3e156afa,Id7e4f2eb
* changes:
  cargo_embargo: detect and ignore harness-less tests
  cargo_embargo: use enum for crate type
2023-03-29 23:55:07 +00:00
Frederick Mayle
5a6dbaae7a cargo_embargo: detect and ignore harness-less tests
These currently cause cargo_embargo to fail. We should support them
eventually, but for now we'll ignore them to unblock crosvm merges.

Test: external/crosvm/android-merge-2-cargo-embargo.sh
Bug: 275386231
Change-Id: I3e156afa5672ddd6257c7caabd05346e060448fb
2023-03-29 15:25:57 -07:00
Frederick Mayle
04a1650a5f cargo_embargo: use enum for crate type
No behavior change intended.

This will make a following CL easier.

Test: external/crosvm/android-merge-2-cargo-embargo.sh
Bug: 275386231
Change-Id: Id7e4f2eb3f25fa12d867852a0ec95ce443949257
2023-03-29 15:24:21 -07:00
Treehugger Robot
43ff63a864 Merge "Utilize from-text stub module in build" 2023-03-29 18:28:30 +00:00
Jihoon Kang
0ae8fe1032 Utilize from-text stub module in build
Replace `android_stubs_current` with `android_from_text_stubs_current`,
a java_api_library module that creates from-text stubs. This feature is
hidden behind a flag `--build-from-text-stub`, which sets the env var
`ANDROID_PUBLIC_STUBS` as `android_from_text_stubs_current`.

Test: m --build-from-text-stub
Bug: 271154441
Change-Id: I06be32d9b7b9a54c0384010457406cabfff98c61
2023-03-27 18:04:34 +00:00
Yi Kong
b8fa3fbd1a Merge "Revert^2 "Update clang version to clang-r487747"" am: 1784c71446
Original change: https://android-review.googlesource.com/c/platform/development/+/2469787

Change-Id: I5fa2b0752799941aeb0c9fc790ab86e4eeede110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 13:44:53 +00:00
Yi Kong
1784c71446 Merge "Revert^2 "Update clang version to clang-r487747"" 2023-03-24 13:19:52 +00:00
Kiyoung Kim
0b853241ed Merge "Create a new build script for builds using SSI artifact" am: 383ddd8fe7
Original change: https://android-review.googlesource.com/c/platform/development/+/2505078

Change-Id: I96598fa70db2874fae5c3612b2464f39edfb4360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 07:46:26 +00:00
Kiyoung Kim
383ddd8fe7 Merge "Create a new build script for builds using SSI artifact" 2023-03-23 07:08:50 +00:00
Kiyoung Kim
c981a31234 Create a new build script for builds using SSI artifact
Build using SSI artifact from the chained build may require extra
arguments from the build. This new script will handle all required
arguments with those new build targets.

Bug: 269977324
Test: N/A
Change-Id: Ia7b1f3c838433d4d51a98be875ac32da88ccbb79
2023-03-23 14:53:25 +09:00
Treehugger Robot
d87ab4e5b5 Merge "Remove AndroidBeamDemo from samples" am: a7ade46095
Original change: https://android-review.googlesource.com/c/platform/development/+/2500844

Change-Id: I7b9809fc065340851ec2229e1ae243f3ccf807ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:47:36 +00:00
Treehugger Robot
a7ade46095 Merge "Remove AndroidBeamDemo from samples" 2023-03-22 02:54:26 +00:00
Henri Chataing
8a56e6ca8f Remove AndroidBeamDemo from samples
Bug: 265394596
Test: m sdk
Change-Id: I54898705900f73c55d9a2eb3ee1372f510b15fe2
Merged-In: I54898705900f73c55d9a2eb3ee1372f510b15fe2
(cherry picked from commit e1f18b0234)
2023-03-22 01:59:29 +00:00
Henri Chataing
c4fc02d6bc Merge "Revert^2 "Remove samples for deprecated Android Beam API"" am: c01e15bdcb
Original change: https://android-review.googlesource.com/c/platform/development/+/2476066

Change-Id: I96831861030227acdd6310dc5f531ac56a96f5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 01:05:23 +00:00
Henri Chataing
c01e15bdcb Merge "Revert^2 "Remove samples for deprecated Android Beam API"" 2023-03-22 00:26:49 +00:00
Stephen Hines
1f481b6f2f Merge "Remove unused variables" am: edab2ac359
Original change: https://android-review.googlesource.com/c/platform/development/+/2495416

Change-Id: Ifa52f306c56c5bcba4ccaddad4a17550bce7ce93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 18:06:12 +00:00
Stephen Hines
edab2ac359 Merge "Remove unused variables" 2023-03-21 16:42:10 +00:00
tanshanshan
16c7d86a81 Remove unused variables
Variables "bDecode" are not used in the function.

Test: mmm development/tools

Change-Id: Ic00ac4682b797c842c503cc5bc2cdbe22f68a94e
Signed-off-by: tanshanshan <tanshanshan@eswincomputing.com>
2023-03-17 15:57:27 +08:00
Peter Collingbourne
76cc43fcb0 Merge "gdbclient.py: Fix gdb-remote command for non-local $ANDROID_SERIAL." am: 462ff76c54
Original change: https://android-review.googlesource.com/c/platform/development/+/2492895

Change-Id: Iac9d4a2dc57da94f69764e86f1a78ff8df6a842b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 01:05:43 +00:00
Peter Collingbourne
462ff76c54 Merge "gdbclient.py: Fix gdb-remote command for non-local $ANDROID_SERIAL." 2023-03-16 00:27:43 +00:00
Peter Collingbourne
b6b58a4d82 gdbclient.py: Fix gdb-remote command for non-local $ANDROID_SERIAL.
As it turns out, gdbclient.py is broken when connecting to a host:port
$ANDROID_SERIAL where the host is something other than localhost,
because it will try to connect to a TCP socket on the host named in
$ANDROID_SERIAL, while lldb-server is not even set up to listen on a TCP
socket on the device (it listens on a Unix socket which gets forwarded
by adb forward to localhost).

Fix it by entirely removing the code that tries to connect directly to
the host if the $ANDROID_SERIAL is of the form host:port.

Change-Id: I91a04aa811b246c9cac82ef3b0779dc284364edf
2023-03-15 14:31:40 -07:00
Henri Chataing
5db4bef9d5 Revert^2 "Remove samples for deprecated Android Beam API"
8de7b4b166

Change-Id: I415762b2fcbc9706a33d7a41858c1c142bb7ffab
Merged-In: I415762b2fcbc9706a33d7a41858c1c142bb7ffab
(cherry picked from commit 614c1aec90)
2023-03-14 23:27:34 +00:00
Xin Li
febe993e58 [automerger skipped] Merge "Merge Android 13 QPR2" am: b25a156d0f -s ours
am skip reason: Merged-In Ia275a2ab69ee31b7d81a2ca8c83bef08cbf107df with SHA-1 0d7a50767b is already in history

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

Change-Id: I5e6cc6b118c86b31e880ed0a8c6ba9f400115597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:34:07 +00:00
Xin Li
efec680126 [automerger skipped] Merge Android 13 QPR2 am: afcb0100a9 -s ours
am skip reason: Merged-In Ia275a2ab69ee31b7d81a2ca8c83bef08cbf107df with SHA-1 0d7a50767b is already in history

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

Change-Id: Ia5e5e3c90fce8db217d49716ecf42321dce84d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:14 +00:00
Xin Li
b25a156d0f Merge "Merge Android 13 QPR2" 2023-03-14 21:40:41 +00:00
Xin Li
afcb0100a9 Merge Android 13 QPR2
Bug: 273316506
Merged-In: Ia275a2ab69ee31b7d81a2ca8c83bef08cbf107df
Change-Id: I8304176691a3d06bc0129d13766d61b518dd8a0f
2023-03-13 23:09:06 -07:00
Christopher Ferris
03c8951115 Merge "Add missing changes from ARCH removal." am: 8f87d99d85
Original change: https://android-review.googlesource.com/c/platform/development/+/2485618

Change-Id: I6b88576c8f8858535f2adb3affc6e5112fa086f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 00:25:35 +00:00
Christopher Ferris
8f87d99d85 Merge "Add missing changes from ARCH removal." 2023-03-13 23:51:09 +00:00
Christopher Ferris
a47d6d090f Add missing changes from ARCH removal.
I somehow didn't upload these fixes from the review. So doing that
now.

Test: Unit tests pass.
Change-Id: Ia17e480eb972db4f7be6947c0e6567632c65431f
2023-03-13 15:22:47 -07:00
Hsin-Yi Chen
e7307617bc Merge "Collect libc++ headers that have no file name extensions" am: 462b91aae1
Original change: https://android-review.googlesource.com/c/platform/development/+/2473566

Change-Id: Ie89f023c62b1dc45a6eb921aa90fe321c810533f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 02:40:02 +00:00
Hsin-Yi Chen
462b91aae1 Merge "Collect libc++ headers that have no file name extensions" 2023-03-13 01:59:52 +00:00
Christopher Ferris
7a7dcc643d Merge "Remove all ARCH references." am: ab5ab25952
Original change: https://android-review.googlesource.com/c/platform/development/+/2481575

Change-Id: I661aa7cb619e33054a618ce0eaf356403cc259c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 23:43:07 +00:00
Christopher Ferris
ab5ab25952 Merge "Remove all ARCH references." 2023-03-10 22:56:58 +00:00
Hsin-Yi Chen
35fce6fed2 Collect libc++ headers that have no file name extensions
Test: LD_LIBRARY_PATH=prebuilts/clang/host/linux-x86/clang-r475365b/lib \
      out/soong/host/linux-x86/nativetest64/header-checker-unittests/header-checker-unittests
Bug: 271382846
Change-Id: Ica435ac635f6ab4f500e31ae1c38c2928b6dc6ac
2023-03-10 14:45:20 +08:00
Christopher Ferris
f62a3be63d Remove all ARCH references.
Replaced with ARCH_IS_32BIT since that's the only thing truly
necessary to work.

This also makes the register regex much more lenient, but it appears
to be strict enough that it doesn't seem to capture arbitrary lines
when run through logcat.

Removed the StripPC function and verified that an arm crash that
ends in 1 still works.

Removed the architecture.py script, it is old and I don't see anyone
using it.

Modify the reading of the lines to ignore any errors in the input.

Test: All unit tests pass.
Test: Symbolized arm and arm64 tombstones
Test: Symbolized x86 and x86_64 tombstones
Test: Ran through a logcat and verified it caught the bug but
Test: didn't print any extra information.
Change-Id: I6a65ecaad68da1d56864db32ff434512e4df0d89
2023-03-09 18:44:59 -08:00
Treehugger Robot
555102b0e5 Merge "Upgrade the 'aday' script to python3." am: 098584724b
Original change: https://android-review.googlesource.com/c/platform/development/+/2479356

Change-Id: I5d4ac0531f59827d281e6e2f41e9a5df1cb8b2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 22:46:48 +00:00
Treehugger Robot
098584724b Merge "Upgrade the 'aday' script to python3." 2023-03-09 21:59:13 +00:00
Elliott Hughes
29f8a271a3 Merge "Remove mips." am: ac2cc9b4a7
Original change: https://android-review.googlesource.com/c/platform/development/+/2477642

Change-Id: Iae32255276ad2a3415acb214c765503c6086ab8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 16:52:16 +00:00
Elliott Hughes
ac2cc9b4a7 Merge "Remove mips." 2023-03-09 16:14:16 +00:00
xutianqi
5b4577977a Upgrade the 'aday' script to python3.
Test: Ran with a BUILD_NUMBER as parameter.

Change-Id: I1048cc8bcb6565e14be00563da565eb3b8ce7989
Signed-off-by: xutianqi <xutianqi@xiaomi.corp-partner.google.com>
2023-03-09 11:08:36 +00:00
Elliott Hughes
c94cb65f21 Remove mips.
We aren't going to support riscv32, so we won't even need to reuse any
of this.

Test: treehugger
Change-Id: I80d6285ecbd0dfdeeb496be39ba63e06cbb30acd
2023-03-09 00:36:31 +00:00
Treehugger Robot
dee0ba66c1 Merge "Support riscv64 in stack tool, remove mips64" am: b3e82ffca0
Original change: https://android-review.googlesource.com/c/platform/development/+/2477638

Change-Id: I6f1006224fcd1b5204310a784469bcb9c0bd89d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 23:53:41 +00:00
Treehugger Robot
b3e82ffca0 Merge "Support riscv64 in stack tool, remove mips64" 2023-03-08 23:25:18 +00:00
Prashanth Swaminathan
01fd4185b1 Support riscv64 in stack tool, remove mips64
Test: atest python-stack_core_test
Test: Manual validation against a crash stack on aosp_riscv64.
Change-Id: Ifc3646486fda9120c30c987f9623e134d3491a9a
2023-03-08 13:21:47 -08:00
Matthew Maurer
ad4f79764c Merge "cargo2android.py: Default to vendor + product" am: e0447d38ef
Original change: https://android-review.googlesource.com/c/platform/development/+/2473104

Change-Id: Ic957e1cc8a6cf9339331e76a69cf8978160226d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 18:52:07 +00:00
Matthew Maurer
e0447d38ef Merge "cargo2android.py: Default to vendor + product" 2023-03-08 18:16:45 +00:00
Matthew Maurer
4b869316ee cargo2android.py: Default to vendor + product
This is used for managing 3p crates, and the vast majority of them
should be available to both vendor and product. Enable support by
default.

Bug: 270690570
Test: Regenerate external/rust/crates/*
Change-Id: Ie5cb4b8d00de5e6ae37c5a69cb2ee0c0cc6f573a
2023-03-06 22:55:36 +00:00
Yi Kong
4476b23303 Revert^2 "Update clang version to clang-r487747"
78eb9e45d8

Change-Id: Iefe6911e88102848ef7185b6214020261f73e43e
2023-03-06 08:04:44 +00:00