Commit Graph

31552 Commits

Author SHA1 Message Date
Joel Galenson
ebb900bb66 Merge changes from topic "rust-tests-and-mappings-refactor" am: 79b55eadb6
Original change: https://android-review.googlesource.com/c/platform/development/+/1918446

Change-Id: Idf1cd131c88b00e4e17403cfac87a0f4165eac5c
2021-12-15 16:05:18 +00:00
Joel Galenson
d028c9b4b1 Use TEST_MAPPING imports for third-party crate tests. am: 4a08c64965
Original change: https://android-review.googlesource.com/c/platform/development/+/1858469

Change-Id: I38b23d157f65194049c37e393d299f5f216792b2
2021-12-15 16:03:17 +00:00
Joel Galenson
26ae6eb466 Merge "Stop generating separate rust_test_host." am: 376a19951b
Original change: https://android-review.googlesource.com/c/platform/development/+/1861786

Change-Id: Ie09dfdafd6002d1e207e5b9dc787f56ed6fa6089
2021-12-15 16:02:03 +00:00
Joel Galenson
79b55eadb6 Merge changes from topic "rust-tests-and-mappings-refactor"
* changes:
  cargo2android: Add tests to both test groups
  Use TEST_MAPPING imports for third-party crate tests.
2021-12-15 15:27:59 +00:00
Joel Galenson
376a19951b Merge "Stop generating separate rust_test_host." 2021-12-15 15:27:59 +00:00
Xin Li
3716cc361f [automerger skipped] Merge "Merge Android 12 QPR1" am: b635a149bb -s ours
am skip reason: Merged-In I7a7c71438880823616a1e696dde71fbfc25a9375 with SHA-1 c5f7a68758 is already in history

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

Change-Id: Ief2d42de3cf3f1d8a164c1ff196332c7d56bd83a
2021-12-14 21:00:26 +00:00
Xin Li
b635a149bb Merge "Merge Android 12 QPR1" 2021-12-14 20:26:09 +00:00
Xin Li
e40bbcbe78 Merge Android 12 QPR1
Bug: 210511427
Merged-In: I7a7c71438880823616a1e696dde71fbfc25a9375
Change-Id: Ib482ee7806ffe5187ff7d10ba96d83112dcf40bf
2021-12-14 08:38:56 -08:00
Treehugger Robot
607fb95dd7 Merge "Remove checked in mkstubs .idea directory" am: 66e859ab9b
Original change: https://android-review.googlesource.com/c/platform/development/+/1921070

Change-Id: I514d05b6f399fc31aeb9c5d814fcadff61acdfca
2021-12-14 05:59:32 +00:00
Treehugger Robot
66e859ab9b Merge "Remove checked in mkstubs .idea directory" 2021-12-14 05:36:52 +00:00
Colin Cross
f6d57ace26 Remove checked in mkstubs .idea directory
Bug: 210509169
Test: treehugger
Change-Id: Ia8cdae9a518abf4107928075447498edfe20d5c4
2021-12-13 20:14:31 -08:00
Matthew Maurer
24758f89e2 cargo2android: Add tests to both test groups
"presubmit" will continue to handle x86_64 virtual device and host tests
"presubmit-rust" will run the test on a pool of physical arm64 devices

Bug: 204332926
Test: regenerated a few TEST_MAPPING files
Change-Id: Idd5cad5107a96031f67305b63875034b2e5a5c60
2021-12-10 20:43:21 +00:00
Treehugger Robot
c5f7a68758 Merge "Updating Platform tools package revision number. Since SDK and NDK finalized API level will be bumped to 32 with their release on 12/8/2021 lets bump up the package version number for Platform tools to keep consistent with it." am: 8fb78e1ffe
Original change: https://android-review.googlesource.com/c/platform/development/+/1914228

Change-Id: I7a7c71438880823616a1e696dde71fbfc25a9375
2021-12-08 06:48:02 +00:00
Treehugger Robot
8fb78e1ffe Merge "Updating Platform tools package revision number. Since SDK and NDK finalized API level will be bumped to 32 with their release on 12/8/2021 lets bump up the package version number for Platform tools to keep consistent with it." 2021-12-08 06:33:03 +00:00
Raju Kulkarni
686314821a Updating Platform tools package revision number. Since SDK and NDK finalized API level will be bumped to 32 with their release on 12/8/2021 lets bump up the package version number for Platform tools to keep consistent with it.
Bug: 209692335
Change-Id: Ibc78dfd6988b8eb2eaa61da2f7b5fb17978d9068
Test: N/A
2021-12-08 00:24:47 +00:00
Joel Galenson
54d655345d Stop generating separate rust_test_host.
With b/196306316 hopefully fixed, we should be able to use a single
rust_test entry for both device and host tests.  This modifies
cargo2android.py so it generates these shared tests.

Test: Run on crates with simple tests, those with defaults, host-only,
and device-only tests.

Change-Id: Icfe8d1fb26a61bc9ed65b8a7b116a4ebcd782ce4
2021-12-06 16:17:06 -08:00
Joel Galenson
4a08c64965 Use TEST_MAPPING imports for third-party crate tests.
This script currently computes all transitive reverse dependencies for
a given crate and adds them to the generated TEST_MAPPING.  This
creates a very large file and makes it difficult to rename/remove
tests, as a given test can be in many TEST_MAPPING files in other
directories.  We fix this by instead importing the TEST_MAPPING files
of other third-party crates.

Note that we cannot do this for tests defined by this crate (as they
need to be in some TEST_MAPPING file) and for tests outside of
external.  For the latter, we do not auto-generate those TEST_MAPPING
files, so they might contain extra tests we do not want or not contain
the tests we do want.  We thus continue to list such tests
individually, which is suboptimal but at least is a strict improvement
over the current system.

Test: Run on a few crates.
Change-Id: Ibdf36e7844f5946c9e321ac60558792abd691b42
2021-12-06 16:15:49 -08:00
Treehugger Robot
676489f321 Merge "Update lint baseline for AutofillKeyboard" am: 62ce42ad0a
Original change: https://android-review.googlesource.com/c/platform/development/+/1827714

Change-Id: I78f516d51a23accdf30dac03e52e2c6f1c28d118
2021-12-03 16:44:30 +00:00
Treehugger Robot
62ce42ad0a Merge "Update lint baseline for AutofillKeyboard" 2021-12-03 16:26:41 +00:00
Treehugger Robot
754c872d03 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: a75fb9f146
Original change: https://android-review.googlesource.com/c/platform/development/+/1909430

Change-Id: Iddde916259c540080a7a3bbdd370c078123d4c1b
2021-12-03 02:31:00 +00:00
Treehugger Robot
a75fb9f146 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" 2021-12-03 02:12:16 +00:00
Treehugger Robot
c57fa7f8b5 Merge "Use input instead of raw_input in gdbclient.py" am: 445a4c4e19
Original change: https://android-review.googlesource.com/c/platform/development/+/1909431

Change-Id: I52b8949ec6463ff8ec2c03b65ad378e47d1459f8
2021-12-02 20:42:46 +00:00
Treehugger Robot
445a4c4e19 Merge "Use input instead of raw_input in gdbclient.py" 2021-12-02 20:25:07 +00:00
Siarhei Vishniakou
9c4f1b3cac Use input instead of raw_input in gdbclient.py
Following suggestions in b/194659728, update the python script to work
under python3.

Previous failure:

Traceback (most recent call last):
  File "/android3/android/master/development/scripts/lldbclient.py", line 413, in <module>
    main()
  File "/android3/android/master/development/scripts/lldbclient.py", line 405, in main
    do_main()
  File "/android3/android/master/development/scripts/lldbclient.py", line 400, in do_main
    raw_input("Press enter to shut down lldb-server")
NameError: name 'raw_input' is not defined

Bug: none
Test: "lldbclient.py --setup-forwarding vscode-lldb -r
/data/nativetest64/inputflinger_tests/inputflinger_tests
--gtest_filter=PalmRejectorTest.GenericAxisValue_IsNotSet"

Change-Id: I21d977cbc580894d6e2eb2f2f56dec04c65b0416
2021-12-02 11:10:37 -08:00
Bob Badour
e3bb741668 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/OBJViewer/Android.bp
  gki/kmi_abi_chk/kmi_compatibility_test.mk
  samples/HeavyWeight/Android.bp
  samples/MySampleRss/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I95aef6515eddf6e1737d7266f9d159f24ac278aa
2021-12-02 10:48:34 -08:00
Joel Galenson
6c8990d3a8 Merge changes If5292d1d,Ib1a86d48 am: d4b099d3fa
Original change: https://android-review.googlesource.com/c/platform/development/+/1902392

Change-Id: I4ca7e64d6f0a21b119d52648352c6a28274898ea
2021-12-02 15:13:20 +00:00
Joel Galenson
d4b099d3fa Merge changes If5292d1d,Ib1a86d48
* changes:
  Stop cargo2android.py from printing the --cargo_bin argument.
  Revert "Enable LTO in cargo2android.py."
2021-12-02 14:46:56 +00:00
Pirama Arumuga Nainar
dfa837214d Merge changes from topic "use-libclang-cpp" am: a226ebf313
Original change: https://android-review.googlesource.com/c/platform/development/+/1901126

Change-Id: Ia9af358847b2f48fe6b5e976007f0a69e41c22f0
2021-12-02 02:31:27 +00:00
Pirama Arumuga Nainar
4f93634073 Switch clang-tools build to clang-r437112 am: 1b19a4956e
Original change: https://android-review.googlesource.com/c/platform/development/+/1901125

Change-Id: Iaff57e382a94f9850f2332b6905edb70bba109cf
2021-12-02 02:31:23 +00:00
Pirama Arumuga Nainar
a226ebf313 Merge changes from topic "use-libclang-cpp"
* changes:
  Use libclang-cpp for header-* tools and tests
  Switch clang-tools build to clang-r437112
2021-12-02 02:07:14 +00:00
Pirama Arumuga Nainar
f5fae5fcab Use libclang-cpp for header-* tools and tests
Bug: http://b/150809112

This is a new upstream library that exports both the clang and LLVM C++
symbols and can replace libLLVM and (android-toolchain-only)
libclang_cxx.so.

Test: Build and run header-* tools
Change-Id: Ibb8ae24e758c4c492c18e1192be9d57ef05b78df
2021-12-01 03:15:13 -08:00
Pirama Arumuga Nainar
1b19a4956e Switch clang-tools build to clang-r437112
Bug: http://b/150809112
Bug: http://b/201432564

Test: prebuilts/clang-tools/build-prebuilts.sh
Change-Id: If75ab1d554a7926c96144be66a85208e76ded8c3
2021-12-01 02:29:32 -08:00
Joel Galenson
5a32724103 Merge "Comment out errors encountered when running cargo test." am: b5b71540cc
Original change: https://android-review.googlesource.com/c/platform/development/+/1906753

Change-Id: Ie959e4b9d1f5ea9e9d10a05d500a484875475d0d
2021-11-30 20:03:16 +00:00
Joel Galenson
b5b71540cc Merge "Comment out errors encountered when running cargo test." 2021-11-30 19:41:11 +00:00
Joel Galenson
56b5f4be29 Comment out errors encountered when running cargo test.
A recent change to remove empty tests runs cargo test --list.  A few
crates produce build errors this way that they did not previously do.
This currently causes cargo2android.py to produce illegal Android.bp
files for these crates even though these should not be fatal errors.
We thus detect these errors and emit them as comments in the
Android.bp file, so developers can see them but the crate can still
compile.

Test: Run on crates with and without such errors.
Change-Id: I8664d3ca9a6b4c513ce0ef35821aa64d22949fc7
2021-11-30 10:34:14 -08:00
Joel Galenson
769c3c373f Stop cargo2android.py from printing the --cargo_bin argument.
cargo2android.py prints out all of its arguments to the top of the
Android.bp file (and into a config file if that option was set) as a
way of persisting them.  However, we do not want to persist the
--cargo_bin directory, as this is a proprety of the local setup and
not the crate itself.  Thus ensure we don't print this.

Test: Run with argument.
Change-Id: If5292d1d740b08755ba6d31654239e93232fdc49
2021-11-24 15:10:02 -08:00
Joel Galenson
903a0f8cb1 Revert "Enable LTO in cargo2android.py."
This reverts commit 4f4ac2f8f3.

This did not work for all crates (specifically, those with build.rs,
as they don't get passed RUSTFLAGS, as well as proc-macros, since they
get the flag but can't use LTO), so we're using a different approach
where this is not desired.

Test: Run script
Change-Id: Ib1a86d4822f51978cd8ec15ad657eb25c84e01a4
2021-11-24 15:09:45 -08:00
Isaac Chen
bb8b18a206 Merge "Build targets for checking GKI KMI compatibility" am: 3e7e4f8816
Original change: https://android-review.googlesource.com/c/platform/development/+/1890319

Change-Id: I1c99b1897a0b0a6c83fa08d0c5aa7fe0765abbe3
2021-11-23 07:38:58 +00:00
Isaac Chen
3e7e4f8816 Merge "Build targets for checking GKI KMI compatibility" 2021-11-23 07:15:22 +00:00
Joel Galenson
e96541ec71 Merge "Enable LTO in cargo2android.py." am: 2ed385fe16
Original change: https://android-review.googlesource.com/c/platform/development/+/1900150

Change-Id: Ifaba0a06dd12a49cef75bf1b5ddac2e6f52c864b
2021-11-23 01:12:55 +00:00
Joel Galenson
2ed385fe16 Merge "Enable LTO in cargo2android.py." 2021-11-23 00:51:53 +00:00
Treehugger Robot
0a7ff6a6b9 Merge "Add license_kinds to VNDK snapshot modules" am: 194afe85d5
Original change: https://android-review.googlesource.com/c/platform/development/+/1895253

Change-Id: Ief0b9f77d1f50c25f161b6dd22ab166afc469cbb
2021-11-23 00:03:31 +00:00
Treehugger Robot
194afe85d5 Merge "Add license_kinds to VNDK snapshot modules" 2021-11-22 23:49:07 +00:00
Joel Galenson
4f4ac2f8f3 Enable LTO in cargo2android.py.
The latest compiler roll also enabled LTO.  This broke
cargo2android.py, as the test prebuit uses LTO and so cannot be linked
with code built without.  We fix this by enabling it in
cargo2android.py (and ensuring it doesn't add the flag into
Android.bp).

Test: Run
Change-Id: I6c6a813ff58a9e5064752aa59b78247c4af77a26
2021-11-22 15:22:45 -08:00
Isaac Chen
a0914f1db4 Build targets for checking GKI KMI compatibility
Current/latest kernel symbol information files default to:
- kernel/prebuilts/5.4/arm64/Module.symvers (for GKI 5.4)
- kernel/prebuilts/5.10/arm64/vmlinux.symvers (for GKI 5.10)

All kernel symbol information files in this CL are manually copied
from AB of corresponding kernel branches.

The history kernel symbol information files in this CL are
sym-5.*/ directories. The ones without build ID suffix are
symbolic links to the latest ones and can be used for
testing the build test of this CL (see Test below).

After *.symvers diles are released to kernel/prebuilts/5.*/arm64
directories on the Android branch, they will be used as the
current/latest kernel symbol files by default.

3 moudules are created in this CL:
  gki_5_4_kmi_compatibility_test (for arm64 GKI 5.4)
  gki_5_10_kmi_compatibility_test (for arm64 GKI 5.10)
  gki_kmi_compatibility_test (for both arm64 GKI 5.4 & 5.10)

Bug: 206064990
Test: $ m gki_kmi_compatibility_test
Change-Id: I2e966070a392cfd6284676c7598138b5cad4717b
2021-11-22 16:46:02 +08:00
Justin Yun
3e78977d25 Add license_kinds to VNDK snapshot modules
The script reads the license files and list them to the license
module in the generated Android.bp files

Bug: 205641081
Test: run gen_buildfiles.py
Change-Id: I93deb04a5e7da25a2e9476b8fdd6079fc5470211
2021-11-22 16:34:16 +09:00
Xin Li
2d66cdd995 Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-18 03:03:43 +00:00
Treehugger Robot
f8a1df582a Merge "Stop building some clang tools for darwin-x86" am: a9ed128e59
Original change: https://android-review.googlesource.com/c/platform/development/+/1885758

Change-Id: I7f05f8d7b7789e709b056ba62ddaf34022c3b54f
2021-11-17 03:59:54 +00:00
Treehugger Robot
a9ed128e59 Merge "Stop building some clang tools for darwin-x86" 2021-11-17 03:45:08 +00:00
Howard Chen
2352705620 Merge "Avoid to use make directly" am: f43f5d50e6
Original change: https://android-review.googlesource.com/c/platform/development/+/1890317

Change-Id: I2e114dffae4c10a3e26a662f425171e2e168e643
2021-11-12 06:54:58 +00:00