Commit Graph

32023 Commits

Author SHA1 Message Date
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
62d67cf938 Merge changes If5292d1d,Ib1a86d48 am: d4b099d3fa am: 6c8990d3a8 am: 6ebfa24970
Original change: https://android-review.googlesource.com/c/platform/development/+/1902392

Change-Id: Ief0e227f09c379c2f2cd8014bb368ceca0e5e34f
2021-12-02 15:56:34 +00:00
Joel Galenson
6ebfa24970 Merge changes If5292d1d,Ib1a86d48 am: d4b099d3fa am: 6c8990d3a8
Original change: https://android-review.googlesource.com/c/platform/development/+/1902392

Change-Id: I35de4f333a2437103d21ddade20fe8c553873f9c
2021-12-02 15:35:39 +00: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
5351630a96 Merge changes from topic "use-libclang-cpp" am: a226ebf313 am: dfa837214d am: 361f6dd6a4
Original change: https://android-review.googlesource.com/c/platform/development/+/1901126

Change-Id: Ia3641d4fd06c20564160578984d2f49bbad3788a
2021-12-02 03:18:40 +00:00
Pirama Arumuga Nainar
43ed0e48e9 Switch clang-tools build to clang-r437112 am: 1b19a4956e am: 4f93634073 am: 89005a207b
Original change: https://android-review.googlesource.com/c/platform/development/+/1901125

Change-Id: Ice50a8f7ab219d80b1b5d4cc0ef40d78b4cebb7e
2021-12-02 03:18:39 +00:00
Pirama Arumuga Nainar
361f6dd6a4 Merge changes from topic "use-libclang-cpp" am: a226ebf313 am: dfa837214d
Original change: https://android-review.googlesource.com/c/platform/development/+/1901126

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

Change-Id: I20b15c15ed0161c7cc93add0e886bba4c6a34223
2021-12-02 03:06:33 +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
abf5c7de91 Merge "Comment out errors encountered when running cargo test." am: b5b71540cc am: 5a32724103 am: 0c5425f48c
Original change: https://android-review.googlesource.com/c/platform/development/+/1906753

Change-Id: I166bfa7933d5565e49ffd64141baa9ee63d9c785
2021-11-30 20:45:42 +00:00
Joel Galenson
0c5425f48c Merge "Comment out errors encountered when running cargo test." am: b5b71540cc am: 5a32724103
Original change: https://android-review.googlesource.com/c/platform/development/+/1906753

Change-Id: I4d07a8c22ef744c369424e8bec9debe3bcfa2f78
2021-11-30 20:32:45 +00: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
1c5df9865e Merge "Build targets for checking GKI KMI compatibility" am: 3e7e4f8816 am: bb8b18a206 am: a02effa270
Original change: https://android-review.googlesource.com/c/platform/development/+/1890319

Change-Id: I4f98f03db07a91ab2eded8f4fbb885cd13ce6ff2
2021-11-23 08:13:00 +00:00
Isaac Chen
a02effa270 Merge "Build targets for checking GKI KMI compatibility" am: 3e7e4f8816 am: bb8b18a206
Original change: https://android-review.googlesource.com/c/platform/development/+/1890319

Change-Id: I5f81348b186f38f0eef715066d177ffbe48093e2
2021-11-23 07:57:44 +00: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
2962348bd5 Merge "Enable LTO in cargo2android.py." am: 2ed385fe16 am: e96541ec71 am: f0bbaa297b
Original change: https://android-review.googlesource.com/c/platform/development/+/1900150

Change-Id: I76a7b027de3d42457555699c21962012b56da679
2021-11-23 01:52:43 +00:00
Joel Galenson
f0bbaa297b Merge "Enable LTO in cargo2android.py." am: 2ed385fe16 am: e96541ec71
Original change: https://android-review.googlesource.com/c/platform/development/+/1900150

Change-Id: Icffdf9d23de7b01bbc257d014be427289143cca0
2021-11-23 01:36:42 +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
8d930711a3 Merge "Add license_kinds to VNDK snapshot modules" am: 194afe85d5 am: 0a7ff6a6b9 am: a078b426d7
Original change: https://android-review.googlesource.com/c/platform/development/+/1895253

Change-Id: I844116c172c090fc9584a225953d51f45e9765c0
2021-11-23 00:35:10 +00:00
Treehugger Robot
a078b426d7 Merge "Add license_kinds to VNDK snapshot modules" am: 194afe85d5 am: 0a7ff6a6b9
Original change: https://android-review.googlesource.com/c/platform/development/+/1895253

Change-Id: I270676f5274ad7da8df2a5d3b48022a1d938b895
2021-11-23 00:18:30 +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
26376e1083 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 2d66cdd995 -s ours am: 2be3c615e7 -s ours
am skip reason: Merged-In I317342f66ebab949158f9d8480f57eacfa5c786d with SHA-1 647214b144 is already in history

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

Change-Id: I5379fb98545323264da0194538d22fa12c2debf6
2021-11-18 03:52:42 +00:00
Xin Li
2be3c615e7 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 2d66cdd995 -s ours
am skip reason: Merged-In I317342f66ebab949158f9d8480f57eacfa5c786d with SHA-1 647214b144 is already in history

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

Change-Id: Ie0889cdbb046eca3d0b436adca8a62de104bfc72
2021-11-18 03:37:16 +00: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
7081591f0d Merge "Stop building some clang tools for darwin-x86" am: a9ed128e59 am: f8a1df582a am: d0ecd9ae95
Original change: https://android-review.googlesource.com/c/platform/development/+/1885758

Change-Id: Ib11d54b66472618f6fe7b82be928aae0a6ebbf39
2021-11-17 04:46:59 +00:00
Treehugger Robot
d0ecd9ae95 Merge "Stop building some clang tools for darwin-x86" am: a9ed128e59 am: f8a1df582a
Original change: https://android-review.googlesource.com/c/platform/development/+/1885758

Change-Id: I0e75329132910bae23ef17b8dac0f6df0de9e116
2021-11-17 04:30:13 +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
Raju Kulkarni
28e49ea93b [DO NOT MERGE] SDK has been finalized for sc-v2-dev. API level is now 32. So remoing rc suffix from Build tools version number. And resetting the SDK to r1 of the API level which is now API 32 am: 84637a4834
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16275978

Change-Id: I9ea7930eb5383ee987fe87872b04c265e85eef98
2021-11-16 20:10:14 +00:00
Raju Kulkarni
84637a4834 [DO NOT MERGE] SDK has been finalized for sc-v2-dev. API level is now 32. So remoing rc suffix from Build tools version number. And resetting the SDK to r1 of the API level which is now API 32
Bug: 202916060

Change-Id: Ia4fc9d87cfc3133d757d35cefcf38d792c114dc6
2021-11-16 18:56:14 +00:00
Howard Chen
2e9ae1b6fa Merge "Avoid to use make directly" am: f43f5d50e6 am: 2352705620 am: 796ccfd128
Original change: https://android-review.googlesource.com/c/platform/development/+/1890317

Change-Id: I8c6da21772fe7bd7f7e0dd1dec14870636958806
2021-11-12 07:26:29 +00:00
Howard Chen
796ccfd128 Merge "Avoid to use make directly" am: f43f5d50e6 am: 2352705620
Original change: https://android-review.googlesource.com/c/platform/development/+/1890317

Change-Id: Icb64b0e63fbe5dcf0d3d2f47ea5666647a3a885b
2021-11-12 07:08:17 +00:00