Commit Graph

32108 Commits

Author SHA1 Message Date
Mu-Le Lee
aa22b20007 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." 2022-06-27 05:25:47 +00:00
Mu-Le Lee
b55856ae03 Remove location information of unnamed elements in dumps to avoid automerge conflict.
Test: ANDROID_BUILD_TOP=`realpath .` \
      PATH=$PATH:`realpath out/soong/dist/bin`:`realpath out/soong/host/linux-x86/bin` \
      development/vndk/tools/header-checker/tests/test.py
Bug: 236800109
Change-Id: I811d9508166f11f7e69ccbc554bcac8b1f122be6
2022-06-27 03:48:03 +00:00
Treehugger Robot
1da99cc99e Merge "c2a: add option to use Cargo.toml.orig" 2022-06-23 15:34:41 +00:00
Anton Hansson
6c8cfa3386 Merge "Dist merged system annotation zip" 2022-06-23 15:07:10 +00:00
Jeff Vander Stoep
2adbd7ed89 c2a: add option to use Cargo.toml.orig
`Cargo --publish` strips dev-dependencies from Cargo.toml, an issue
that won't be fixed until [1] is resolved, which doesn't seem
likely as it has been open for ~5 years now.

cargo2android needs dev-dependencies listed in Cargo.toml in order
to generate the rust_test in Android.bp, add an option that tells
cargo2android to use the cargo.toml.orig instead of the cargo.toml.

With this change there are now two options that temporarily
update Cargo.toml, so I've pulled these out into a separate class
to clean up the code a bit.

[1] https://github.com/rust-lang/cargo/issues/4242

Test: run against projects with --add_workspace and
--orig-cargo-toml

Change-Id: I3b8633a807c9734981ebde0bef9b73868acf6774
2022-06-23 16:38:08 +02:00
Anton Hansson
8e63be9278 Dist merged system annotation zip
The system-data/annotations.zip was previously generated
by the monolithic system sdk rule. Migrate it over to the
newly introduced modularized/merged target.

Bug: 235140934
Test: m sdk dist && ls out/dist/system-data | grep annotations
Change-Id: I1afc4ef7fdf87555adecdb11296bc07d25193ca2
2022-06-23 10:14:39 +00:00
Treehugger Robot
d0e21e93fb Merge "c2a: Automatically make crates APEX available" 2022-06-22 19:25:58 +00:00
Treehugger Robot
8b3339921b Merge "Update tests due to clang variable and struct naming changes." 2022-06-22 07:58:27 +00:00
Mu-Le Lee
e5f137adf2 Update tests due to clang variable and struct naming changes.
Test: ANDROID_BUILD_TOP=`realpath .` \
      PATH=$PATH:`realpath out/soong/dist/bin`:`realpath out/soong/host/linux-x86/bin` \
      development/vndk/tools/header-checker/tests/test.py
Bug: 236780777
Change-Id: I794bcb9e9c922c642c3fbf0808fb60de4445ab65
2022-06-22 04:10:43 +00:00
Matthew Maurer
a9fb65d155 c2a: Automatically make crates APEX available
The bulk of Rust packages in external/ are OS agnostic and do not care
about individual platform features. This change is intended to reduce
the churn of repeatedly adding new `apex_available` attributes to crates
by defaulting to availability. When landing a new crate which is either
platform revision specific or has an unstable file format, prefer to
set `apex_available: ["//apex_available:platform"]` until you have
thought things through.

Bug: 174862583
Test: Regenerate with no apex_available, see universal availability
Test: Regenerate with apex_available: [], see []
Test: Regenerate with apex_available: [foo], see [foo]
Change-Id: I958597789bfc966caec043d051996284dab7a927
2022-06-16 13:07:12 -07:00
Elliott Hughes
d70c7045c1 Merge "Work around an lldb bug with "localhost"." 2022-06-15 14:26:05 +00:00
Elliott Hughes
fc6da790d9 Work around an lldb bug with "localhost".
Bug: http://b/234034124
Test: reputed to work
Change-Id: I3414201712ffe0f808899e2a2f206e813bb609a7
2022-06-14 17:59:32 -07:00
Matthew Maurer
270633f6ca Merge changes Ie8ff0e35,I4aebdb5e,I4d9b906f
* changes:
  c2a: Only use postsubmit when configured
  c2a: Denylist additional Rust tests modules
  c2a: Do not assume test_mapping.json exists
2022-06-14 23:29:35 +00:00
Matthew Maurer
e1d07ba872 c2a: Only use postsubmit when configured
Previous logic would place tests in both presubmit and postsubmit if the
postsubmit_tests configuration was not specified. This is both
unnecessary and wastes resources because presubmit tests are also run in
postsubmit.

Bug: 236006683
Test: Regenerate all TEST_MAPPINGs, manually check postsubmit removal
Change-Id: Ie8ff0e351776711e07bf7646efd916d970254e9c
2022-06-14 16:28:36 -07:00
Matthew Maurer
037b445ed8 c2a: Denylist additional Rust tests modules
These modules are not suitable for direct execution on cuttlefish, but
are still built as `rust_test` to get the harness.

Bug: 233924440
Test: Regenerate all TEST_MAPPINGs, pass presubmit
Change-Id: I4aebdb5e36cf3a80780483e0a7ebeb83e9735d29
2022-06-14 14:32:15 -07:00
Matthew Maurer
3f7f7e2236 c2a: Do not assume test_mapping.json exists
update_crate_tests would previously assume test_mapping.json existed
when trying to generate a TEST_MAPPING update. This made updating
mappings for the majority of existing crates fail.

Bug: 233924440
Test: Regenerate all Rust TEST_MAPPINGs
Change-Id: I4d9b906f4db233ee0223a3035c1b63bf1ca681f4
2022-06-14 14:32:00 -07:00
Treehugger Robot
57d34a4b72 Merge "Allow ABI dumps to contain ANDROID_BUILD_TOP that is not a path prefix" am: 1a4e4daf49
Original change: https://android-review.googlesource.com/c/platform/development/+/2122585

Change-Id: I42ea1f542eeaf7ca8cd1b8309f59ea882cdb465a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 10:28:48 +00:00
Treehugger Robot
1a4e4daf49 Merge "Allow ABI dumps to contain ANDROID_BUILD_TOP that is not a path prefix" 2022-06-13 10:05:10 +00:00
Hsin-Yi Chen
2ed4052a06 Allow ABI dumps to contain ANDROID_BUILD_TOP that is not a path prefix
Test: ./create_reference_dumps.py -products aosp_x86_64 -libs libm
Bug: 235300136
Change-Id: I75fa175018d6ed0da7a0949ff133869fd874c667
2022-06-13 16:47:32 +08:00
Yi-yo Chiang
f80aa1285c Merge "create_reference_dumps.py: Always rebuild lsdump_paths.txt" am: c38fa6eb0a
Original change: https://android-review.googlesource.com/c/platform/development/+/2096997

Change-Id: I216f5f6c765ef9ca50b23a20e0d9417dddfadf7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 04:18:27 +00:00
Yi-yo Chiang
c38fa6eb0a Merge "create_reference_dumps.py: Always rebuild lsdump_paths.txt" 2022-05-25 04:03:43 +00:00
Yi-Yo Chiang
43271c7bc8 create_reference_dumps.py: Always rebuild lsdump_paths.txt
If the contents of lsdump_paths.txt was corrupted,
create_reference_dumps.py might not rebuild lsdump_paths.txt due to
incremental build mechanism. Manually unlink and rebuild
lsdump_paths.txt in create_reference_dumps.py so that it always get the
up-to-date lsdump_paths.txt.

Bug: 233562033
Test: $ development/vndk/tools/header-checker/utils/create_reference_dumps.py -l libbinder -product aosp_arm64
  $ echo "" > $ANDROID_PRODUCT_OUT/lsdump_paths.txt
  $ development/vndk/tools/header-checker/utils/create_reference_dumps.py -l libbinder -product aosp_arm64
Change-Id: Iedccba6ffb659b3348c4f3fb57b82e38de8e53c3
2022-05-24 18:25:38 +08:00
Treehugger Robot
765adcd583 Merge "create_reference_dumps.py: Clear SKIP_ABI_CHECKS" am: 323c559e2e
Original change: https://android-review.googlesource.com/c/platform/development/+/2101513

Change-Id: Iaad05eacd4cbb77da78bbf69b2c8d338638e33fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 08:31:22 +00:00
Treehugger Robot
323c559e2e Merge "create_reference_dumps.py: Clear SKIP_ABI_CHECKS" 2022-05-24 08:03:43 +00:00
Yi-Yo Chiang
ec469d15ea create_reference_dumps.py: Clear SKIP_ABI_CHECKS
It's possible that a developer would set SKIP_ABI_CHECKS during
development, and only execute create_reference_dumps.py before
submitting the change. If the developer forgot to clear SKIP_ABI_CHECKS
before running create_reference_dumps.py, the developer would be hit by
a confusing error (something about lsdump_paths.txt has invalid format),
because some preconditions of create_reference_dumps.py aren't met.
The error message isn't helpful as it doesn't tell the developer how to
resolve the error.
Let's just unset SKIP_ABI_CHECKS in create_reference_dumps.py, so
create_reference_dumps.py can be as fool-proof as possible.
The developer doesn't need to know the preconditions of
create_reference_dumps.py as it should handle it by itself.

Bug: 233562033
Test: export SKIP_ABI_CHECKS=true && ./create_reference_dumps.py
Change-Id: I397f1fcad7f0a1f9a7cb2781f32d85cdf2439e60
2022-05-24 14:29:01 +08:00
Treehugger Robot
5d4f0e7546 Merge "Fix adb proxy get device id on windows" am: 120f46ef53
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I0af71f0dbb26c1dfd0b52aadf6c68ec20bca6c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 14:57:42 +00:00
Treehugger Robot
120f46ef53 Merge "Fix adb proxy get device id on windows" 2022-05-23 14:42:21 +00:00
zengshuchuan
a7526ac28b Fix adb proxy get device id on windows
Window adb device contains a '\r' character,
translate string to integer comparing.

Bug: 232488036
Test: 1. Excute python.exe winscope_proxy.py on Window Powershell.
2. Launch winscope index.html and set the Winscope token.
3. Tablet connect adb and winscope select the device.
4. Tap the 'DUMP STATE' button.

Change-Id: I8c261da523763982ea4a4bfae6883694b221883c
2022-05-13 16:58:41 +08:00
Anton Hansson
0f1b793d59 Merge "Use lint database from api_versions_public" am: 4f9305a51c
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: Id3b47831f9a0d1a4966b7248c7e8110d9ef902f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:41:59 +00:00
Anton Hansson
4f9305a51c Merge "Use lint database from api_versions_public" 2022-05-11 08:11:45 +00:00
Anton Hansson
1d75c7fe31 Use lint database from api_versions_public
These two databases are (nearly) identical but the latter is generated
in a much more efficient way.

The diffs are very minor and it's not clear to me which versions is more
correct than the other, though I'm fairly confident they don't matter.

https://paste.googleplex.com/5567994005553152

Bug: 187398174
Test: diff api-versions.xml
Change-Id: I97375e0d72675bc8ff102551b3e3913e684be683
2022-05-09 10:46:38 +00:00
Treehugger Robot
a830ff7604 Merge "Bumping package version number for next release Test: N/A Bug: b/230461482 Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260" am: 430aa3f2a4
Original change: https://android-review.googlesource.com/c/platform/development/+/2090346

Change-Id: I303503a53c9062fd119f00948d968007e3d687e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 23:21:07 +00:00
Treehugger Robot
430aa3f2a4 Merge "Bumping package version number for next release Test: N/A Bug: b/230461482 Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260" 2022-05-06 22:54:02 +00:00
Raju Kulkarni
fc22586cb5 Bumping package version number for next release
Test: N/A
Bug: b/230461482
Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260
2022-05-06 21:36:19 +00:00
Christopher Ferris
7a20156f00 Merge "Modify any lines with libc.so!libc.so to libc.so." am: d6ba6d2400
Original change: https://android-review.googlesource.com/c/platform/development/+/2089004

Change-Id: I226df484bd07165819e658ca6f7abe666b5db742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 01:43:50 +00:00
Christopher Ferris
d6ba6d2400 Merge "Modify any lines with libc.so!libc.so to libc.so." 2022-05-06 01:11:41 +00:00
Christopher Ferris
7d4d527a1c Modify any lines with libc.so!libc.so to libc.so.
I had made this change if there was an offset on the line,
but I didn't make if there is no offset present. Add the
no offset present case.

Bug: 206463081

Test: Ran unit tests.
Test: Modified a normal stack line with libart.so to be
Test: libart.so!libart.so and verified the line numbers
Test: are still present.
Change-Id: I75e3fbe5eaa3a5419a2dca2c4542731c61c7b971
2022-05-05 15:14:01 -07:00
Christopher Ferris
b57824f4c1 Merge "Allow fixup of apex directories." am: 53c707781a
Original change: https://android-review.googlesource.com/c/platform/development/+/2072700

Change-Id: I100da8b90b03ce3c1e57ef235fb4821ac4f69e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 19:35:47 +00:00
Christopher Ferris
53c707781a Merge "Allow fixup of apex directories." 2022-05-03 19:02:24 +00:00
Treehugger Robot
0cb5053b09 Merge "Update clang-tools build to clang-r450784d" am: 5c744010a0
Original change: https://android-review.googlesource.com/c/platform/development/+/2080102

Change-Id: I75d539ec83f8121597fa6678f7ad94f21a16203f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:41:20 +00:00
Treehugger Robot
5c744010a0 Merge "Update clang-tools build to clang-r450784d" 2022-04-28 19:54:02 +00:00
Yi Kong
70645edd80 Update clang-tools build to clang-r450784d
Bug: 219872355
Test: presubmit
Change-Id: I05db5bfbf8562ec8a0ce0f36e4e2446bbb705da0
2022-04-29 02:52:19 +08:00
Anton Hansson
2859fabd5e Merge "Remove non-existing dependency" am: 1db78504aa
Original change: https://android-review.googlesource.com/c/platform/development/+/2077461

Change-Id: Ib386b102f7ad27957fed278df57e57f0612091df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 13:11:37 +00:00
Anton Hansson
1db78504aa Merge "Remove non-existing dependency" 2022-04-28 12:18:56 +00:00
Ivan Lozano
afe6de53e3 Merge "Add test_mapping_config to update_crate_tests" am: 175c7a013d
Original change: https://android-review.googlesource.com/c/platform/development/+/2075847

Change-Id: I4284eda9445f892cdc2a81dccb0ed195d737eefd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:26:59 +00:00
Anton Hansson
1710a2efc7 Remove non-existing dependency
We have removed the system-images sdk zip, so remove the tracking of it
as a dependency for the addon.

Bug: 205008975
Test: presubmit
Change-Id: I14e47d6418f355c6c7db7444a25c3030f36a3f92
2022-04-27 15:41:13 +00:00
Ivan Lozano
175c7a013d Merge "Add test_mapping_config to update_crate_tests" 2022-04-27 14:06:25 +00:00
Anton Hansson
460b007629 Merge changes from topic "sdksys" am: 0a264aa980
Original change: https://android-review.googlesource.com/c/platform/development/+/2073609

Change-Id: I1b54052b0b9534cbd8c9a2593932bfbb5f049bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 11:18:58 +00:00
Anton Hansson
7764ce3cb6 Stop building the system-image zip am: 897fe05053
Original change: https://android-review.googlesource.com/c/platform/development/+/2073608

Change-Id: I672659eb7b2fc57194c9e091bd905e75b0009b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 11:18:52 +00:00
Anton Hansson
0a264aa980 Merge changes from topic "sdksys"
* changes:
  Remove system-images files from the SDK
  Stop building the system-image zip
2022-04-27 10:56:04 +00:00