Commit Graph

34548 Commits

Author SHA1 Message Date
Henri Chataing
3a4e023766 Merge "Revert^2 "Remove samples for deprecated Android Beam API"" 2023-02-13 17:07:59 +00:00
Diego Perez
4f99a31ba0 Move aapt2 Windows binary to 64bit
Bug: 266868960
Test: atest aapt2_tests
Change-Id: I858ca4028c2420598f65dcde8f413079b6df0047
2023-02-10 11:13:57 +00:00
Charles Chen
bc4a213dee Merge "Add sample app for VisualQueryDetection connection" 2023-02-07 05:18:04 +00:00
Henri Chataing
614c1aec90 Revert^2 "Remove samples for deprecated Android Beam API"
8de7b4b166

Change-Id: I415762b2fcbc9706a33d7a41858c1c142bb7ffab
2023-02-06 22:25:55 +00:00
Charles Chen
d644524452 Add sample app for VisualQueryDetection connection
Test: Manual
Bug: 261517532
Change-Id: I5121f86b5ec3469813f5f3d95dfba01d39ce6f1c
2023-02-06 15:45:38 +00:00
Treehugger Robot
26d7e63859 Merge "Extend cargo2android.py version matching to include alpha and beta crates" am: 66f9ab6962 am: 2a9c4a2b22 am: 05b9ae4eef
Original change: https://android-review.googlesource.com/c/platform/development/+/2421465

Change-Id: Ic7d0e633e7d8846684873da63c12bed177e88042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 23:33:30 +00:00
Treehugger Robot
05b9ae4eef Merge "Extend cargo2android.py version matching to include alpha and beta crates" am: 66f9ab6962 am: 2a9c4a2b22
Original change: https://android-review.googlesource.com/c/platform/development/+/2421465

Change-Id: I493c28066877c2151482f5fe99959b29b3c90090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 23:03:23 +00:00
Treehugger Robot
2a9c4a2b22 Merge "Extend cargo2android.py version matching to include alpha and beta crates" am: 66f9ab6962
Original change: https://android-review.googlesource.com/c/platform/development/+/2421465

Change-Id: I8f39dc8dc3f035f050adc7de2adfdbed329d4da5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 22:40:38 +00:00
Treehugger Robot
66f9ab6962 Merge "Extend cargo2android.py version matching to include alpha and beta crates" 2023-02-03 22:01:40 +00:00
Colin Cross
602c2483a5 Extend cargo2android.py version matching to include alpha and beta crates
The ring crate hasn't had a non-alpha release in over two years, and
may need to be updated to an alpha release.  Modify the version regex
in cargo2android.py to recognize the alpha version as part of the
version suffix.

Test: manually run cargo2android.py in redshell
Change-Id: If48d5be339d10bc3e6651485b0038b7219403077
2023-02-03 12:39:51 -08:00
Treehugger Robot
2f6b3fbeba Merge "Rolling to 34.0.0. for UDC." am: c60a5da303 am: e04ea4a2f4 am: 2c8aeb3fd2
Original change: https://android-review.googlesource.com/c/platform/development/+/2419798

Change-Id: Ic9527c6bc9ff0cbc2dfd0fa004e2a3e8760f7807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 19:13:54 +00:00
Treehugger Robot
2c8aeb3fd2 Merge "Rolling to 34.0.0. for UDC." am: c60a5da303 am: e04ea4a2f4
Original change: https://android-review.googlesource.com/c/platform/development/+/2419798

Change-Id: Ie141df430fbf0ed2d371bb95ba373b5b0b7e6ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 18:39:26 +00:00
Treehugger Robot
e04ea4a2f4 Merge "Rolling to 34.0.0. for UDC." am: c60a5da303
Original change: https://android-review.googlesource.com/c/platform/development/+/2419798

Change-Id: Icb7b84371bea8f8a0f20dc17a340340f36a6c68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 18:16:50 +00:00
Treehugger Robot
c60a5da303 Merge "Rolling to 34.0.0. for UDC." 2023-02-03 18:01:03 +00:00
Shaju Mathew
43940506b3 Rolling to 34.0.0. for UDC.
Bug: 267330961

Test: Treehugger

Change-Id: Ieeb199230e9f037cfeb7dfa16ecc8eead17ac574
Signed-off-by: Shaju Mathew <shaju@google.com>
2023-02-02 17:03:59 -08:00
Hsin-Yi Chen
35e7e0cc27 Merge "Diff array types" am: 9b286a1967 am: e380c2f9cc am: ab164d548b
Original change: https://android-review.googlesource.com/c/platform/development/+/2385933

Change-Id: I7055cf8f16a3b4ede0f26d8629d4cbbf8ae1de61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 22:30:40 +00:00
Hsin-Yi Chen
2133deee29 Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult" am: 6ecc9e3997 am: fe3d1b16b4 am: ceb1b92809
Original change: https://android-review.googlesource.com/c/platform/development/+/2411373

Change-Id: I7d49f580b9d3c1eae11dd4e1d50b517cc7162056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 22:18:37 +00:00
Hsin-Yi Chen
ab164d548b Merge "Diff array types" am: 9b286a1967 am: e380c2f9cc
Original change: https://android-review.googlesource.com/c/platform/development/+/2385933

Change-Id: I84fb222026613f6fd6f783a005b7ad4886bb64cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:40:54 +00:00
Hsin-Yi Chen
ceb1b92809 Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult" am: 6ecc9e3997 am: fe3d1b16b4
Original change: https://android-review.googlesource.com/c/platform/development/+/2411373

Change-Id: I357e4cc61c395c5848cb8689d40cb594e4c8eade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:32:11 +00:00
Hsin-Yi Chen
e380c2f9cc Merge "Diff array types" am: 9b286a1967
Original change: https://android-review.googlesource.com/c/platform/development/+/2385933

Change-Id: I1227595d9835dcc1ce5420bc19a5d7e674a18926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:31:11 +00:00
Hsin-Yi Chen
fe3d1b16b4 Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult" am: 6ecc9e3997
Original change: https://android-review.googlesource.com/c/platform/development/+/2411373

Change-Id: Iceeeaa05c59645fb81083b576da47382c846fa3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 20:55:12 +00:00
Nataniel Borges
8992b465f5 Use regex for winscope filters
Bug: 265666404
Test: run winscope and test the filters
Change-Id: I7db71e880a196203e5c7592704fa777781d20d28
2023-02-02 14:26:11 +00:00
Hsin-Yi Chen
9b286a1967 Merge "Diff array types" 2023-02-02 08:27:42 +00:00
Hsin-Yi Chen
6ecc9e3997 Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult" 2023-02-02 06:31:49 +00:00
Hsin-Yi Chen
64930c428f Diff array types
This commit implements the function that compares array size, alignment,
and element type.

Test: ./test.py ; update prebuilts/clang-tools and build
Bug: 255702405

Change-Id: I4f25d22f060cfda04bbd88b9c2521461b95e6829
2023-02-02 12:58:35 +08:00
Jeffrey Vander Stoep
929a4d412c Merge "c2a: make Rust version matchin regex less exact" am: 7b902e93f4 am: d735d27953 am: 6c483c6846
Original change: https://android-review.googlesource.com/c/platform/development/+/2411666

Change-Id: I63f3f54be4c651ec9b8a80fb94db5ac1dfdd508d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 22:04:20 +00:00
Jeffrey Vander Stoep
6c483c6846 Merge "c2a: make Rust version matchin regex less exact" am: 7b902e93f4 am: d735d27953
Original change: https://android-review.googlesource.com/c/platform/development/+/2411666

Change-Id: Ice494ed5832677ed66480f4a09a7a85f31174e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 21:24:22 +00:00
Jeffrey Vander Stoep
d735d27953 Merge "c2a: make Rust version matchin regex less exact" am: 7b902e93f4
Original change: https://android-review.googlesource.com/c/platform/development/+/2411666

Change-Id: I927ad6fa96e813c7c2da7023561b09e52bb2ee3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 20:46:38 +00:00
Jeffrey Vander Stoep
7b902e93f4 Merge "c2a: make Rust version matchin regex less exact" 2023-02-01 18:12:39 +00:00
TreeHugger Robot
6974e6367b Merge "Use fancy for hwui too" 2023-02-01 17:40:53 +00:00
Jeff Vander Stoep
b06dd5c7e2 c2a: make Rust version matchin regex less exact
Allow custom version like 1.65.0.p1 (added in aosp/2404317).

Resolves warning:
WARNING: cannot find RustDefaultVersion in
development/scripts/../../build/soong/rust/config/global.go
Change-Id: I6fced7695473e025b0f739f9986df932d2c3f5fe

Test: cargo2android.py --config cargo2android.py
no warning

Change-Id: I43ff81f061477fc0322f27fef1c950954130dbc6
2023-02-01 14:23:40 +01:00
John Reck
d8b73b59eb Use fancy for hwui too
Test: clion
Change-Id: I627d358e68391c882ffdd2236eab0e978b11cfdc
2023-02-01 07:09:58 -05:00
Kean Mariotti
f6e25fb5e0 Merge "Fix broken trace collection" 2023-02-01 10:33:16 +00:00
Jeffrey Vander Stoep
eeebe30455 Merge "Include non-local tests by path" am: 6e50b8e094 am: 16f9b85bed am: dff4d31a72
Original change: https://android-review.googlesource.com/c/platform/development/+/2402710

Change-Id: I050f6be1b718d93c45f5c4dd5de94d88a916f82c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 09:50:25 +00:00
Jeffrey Vander Stoep
dff4d31a72 Merge "Include non-local tests by path" am: 6e50b8e094 am: 16f9b85bed
Original change: https://android-review.googlesource.com/c/platform/development/+/2402710

Change-Id: I92eab5e51191b68b928cd1c3a09ed16ced136e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 09:11:38 +00:00
Hsin-Yi Chen
eb5797a263 Rename GenericFieldDiffInfo to RecordFieldDiffResult
Test: ./test.py
Bug: 255702405
Change-Id: I7e1112697f75b0a93ab821a128054e7e80acd6e1
2023-02-01 16:22:31 +08:00
Jeffrey Vander Stoep
16f9b85bed Merge "Include non-local tests by path" am: 6e50b8e094
Original change: https://android-review.googlesource.com/c/platform/development/+/2402710

Change-Id: Iafd69de2a3e3845ef143ffc23eecaa8396fd788f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 08:17:12 +00:00
Jeffrey Vander Stoep
6e50b8e094 Merge "Include non-local tests by path" 2023-02-01 07:42:21 +00:00
Treehugger Robot
033ee89f83 Merge "Platform tools 33.0.4: rev bump" am: c3e0908508 am: 17008c1ce2 am: 520ccc6b0d
Original change: https://android-review.googlesource.com/c/platform/development/+/2410815

Change-Id: I1618ad59434034203c8ba2f625f05c2bd4637da0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 23:13:00 +00:00
Treehugger Robot
520ccc6b0d Merge "Platform tools 33.0.4: rev bump" am: c3e0908508 am: 17008c1ce2
Original change: https://android-review.googlesource.com/c/platform/development/+/2410815

Change-Id: I23cf1cbb61a6e379ae256122c70aac54948bec43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 22:29:27 +00:00
Treehugger Robot
17008c1ce2 Merge "Platform tools 33.0.4: rev bump" am: c3e0908508
Original change: https://android-review.googlesource.com/c/platform/development/+/2410815

Change-Id: Icedc41860afa6f4496d543963eb50bf4abe0df6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 21:21:37 +00:00
Kean Mariotti
f180c8eb7d Fix broken trace collection
- Fix order of accesses to TracingConfig class. The CollectTracesComponent used to fetch
configurations from TracingConfig before TraceConfigComponent changes, i.e. CollectTracesComponent
was missing the latest changes to TracingConfig.
- Remove TracingConfig initialization performed in AppComponent. Now TracingConfig takes care of
fetching the globalConfig's MODE (DEV or PROD) and initialize accordingly.
- Remove TracingConfig#isTracingConfigSet(). Now TracingConfig is always fully constructed/initialized.
- Rename various "tracing config" methods to "trace config" to reduce confusion with TracingConfig class

Fix: b/267275104
Test: npm run build:all && npm run test:all
Change-Id: I168a25f69a405422d8d983d5710d6a67773f0b48
2023-01-31 20:53:59 +00:00
Treehugger Robot
c3e0908508 Merge "Platform tools 33.0.4: rev bump" 2023-01-31 20:51:47 +00:00
Shaju Mathew
fc4c4f311f Platform tools 33.0.4: rev bump
Bug: 267330961
Bug: 267327613
Bug: 248249899

Test: Treehugger
Change-Id: I7ce0c5b90e8b8f7be6c43dcc6190389bfe24ac8f
2023-01-31 11:11:48 -08:00
Jeff Vander Stoep
408e5db8d9 Include non-local tests by path
Import paths for non-local tests because including tests
directly has proven to be fragile and burdensome. For example,
whenever a project removes or renames a test, all the TEST_MAPPING
files for its reverse dependencies must be updated or we get test
breakages. That can be many tens of projects that must updated to
prevent the reported breakage of tests that no longer exist.
Similarly when a test is added, it won't be run when the reverse
dependencies change unless/until update_crate_tests.py is run for its
depenencies. Importing TEST_MAPPING files instead of tests solves
both of these problems. When tests are removed, renamed, or added,
only files local to the project need to be modified. The downside is
that we potentially miss some tests. But this seems like a reasonable
tradeoff since it's primarily unit tests that are missing, and all
unit tests are always run on the host for every presubmit.

See aosp/2400500 as an example of what test mapping files now
look like after this change.

Test: run it over all projects in external/rust/crates
Change-Id: I2b644f9ebf97968c9928f5b1756b2ab199e8e7ca
2023-01-30 13:10:25 +01:00
Treehugger Robot
abf057630e Merge "VSDK fake snapshot may read hwasan modules" am: b1fbcaf684 am: 3c0614c2db am: 3a0cb1f015
Original change: https://android-review.googlesource.com/c/platform/development/+/2399453

Change-Id: I86a8076fd3dbbfb6f6dfd944df03f1244dc0a82a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 08:30:31 +00:00
Treehugger Robot
3a0cb1f015 Merge "VSDK fake snapshot may read hwasan modules" am: b1fbcaf684 am: 3c0614c2db
Original change: https://android-review.googlesource.com/c/platform/development/+/2399453

Change-Id: I7495c741db4005d53bef520079c7962230809363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 07:37:09 +00:00
Treehugger Robot
3c0614c2db Merge "VSDK fake snapshot may read hwasan modules" am: b1fbcaf684
Original change: https://android-review.googlesource.com/c/platform/development/+/2399453

Change-Id: I75f2cb25e93c7aa27a17c0306036040865412dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 06:55:19 +00:00
Treehugger Robot
b1fbcaf684 Merge "VSDK fake snapshot may read hwasan modules" 2023-01-27 06:16:32 +00:00
Charisee Chiw
7a8661e5cc Merge "Change requests for Rust update v1.66.0" am: 1ef73b3454 am: 5a9278969f am: 33a2959059
Original change: https://android-review.googlesource.com/c/platform/development/+/2399165

Change-Id: I5ef4dfc527db171275e363a81a2d452a756dfb2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 01:22:12 +00:00