Commit Graph

33760 Commits

Author SHA1 Message Date
Treehugger Robot
50c290b78a Merge "Add FLAG_IMMUTABLE in DevTools app" am: 95e0aacc63 am: 40d5fb833c
Original change: https://android-review.googlesource.com/c/platform/development/+/2383492

Change-Id: I6ccb006501aebf516abd6490fd390abf7c4e9ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 14:38:10 +00:00
Treehugger Robot
40d5fb833c Merge "Add FLAG_IMMUTABLE in DevTools app" am: 95e0aacc63
Original change: https://android-review.googlesource.com/c/platform/development/+/2383492

Change-Id: I81b30c05cd3e3748486e45341b542871c7903d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 14:03:20 +00:00
Treehugger Robot
95e0aacc63 Merge "Add FLAG_IMMUTABLE in DevTools app" 2023-01-20 13:27:34 +00:00
Yabin Cui
ad990bcfc2 Merge "Update clang-tools build to clang-r475365b" am: 7d47151afb am: 682aa72cab
Original change: https://android-review.googlesource.com/c/platform/development/+/2393416

Change-Id: I67bb0b26dd39a50941dfc387440fea1c2285437f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 21:48:22 +00:00
Yabin Cui
682aa72cab Merge "Update clang-tools build to clang-r475365b" am: 7d47151afb
Original change: https://android-review.googlesource.com/c/platform/development/+/2393416

Change-Id: I1d146baa4b68fd18e81c09e13ddec98b700b423f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 21:17:02 +00:00
Yabin Cui
7d47151afb Merge "Update clang-tools build to clang-r475365b" 2023-01-19 20:42:44 +00:00
Treehugger Robot
937c03c8d4 Merge "Fix adb_py module." am: 085867a244 am: 37a0149a2d
Original change: https://android-review.googlesource.com/c/platform/development/+/2394273

Change-Id: I219c95d6d02a1d96a0427af0b208342e9c404e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 02:46:55 +00:00
Treehugger Robot
37a0149a2d Merge "Fix adb_py module." am: 085867a244
Original change: https://android-review.googlesource.com/c/platform/development/+/2394273

Change-Id: Ie20e128ef6ffd910ebbc9b5af94f068858283228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 02:15:49 +00:00
Treehugger Robot
085867a244 Merge "Fix adb_py module." 2023-01-19 01:23:54 +00:00
Frederick Mayle
637e41a172 Merge "cargo_embargo: new cargo2android tool" am: c72989659a am: 9ed2a1bb41
Original change: https://android-review.googlesource.com/c/platform/development/+/2315578

Change-Id: Ic1c8e75b00c58fc199358656c9836eb05da65c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 22:41:36 +00:00
Dan Albert
dcf513a013 Fix adb_py module.
Apparently these tests are used, they are just defined in
//packages/modules/adb, so atest can't find them here.

Bug: http://b/265846006
Test: ran adb_integration_test_device
Change-Id: If1d82280ab51e80497d235f55582688b78c00f5b
2023-01-18 22:23:38 +00:00
Frederick Mayle
9ed2a1bb41 Merge "cargo_embargo: new cargo2android tool" am: c72989659a
Original change: https://android-review.googlesource.com/c/platform/development/+/2315578

Change-Id: I0feaa29e099f406e297b26a7d75201d559fff1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 22:06:05 +00:00
Frederick Mayle
c72989659a Merge "cargo_embargo: new cargo2android tool" 2023-01-18 21:31:44 +00:00
Frederick Mayle
77eb4ba473 cargo_embargo: new cargo2android tool
A fork of cargo2android, initially aimed at big imports like crosvm.

* Faster run time when there are many packages (30 min -> 1 min for
  crosvm).

* `--reuse-cargo-out` feature allows iterating on most of the config
  with sub second run time.

* Most options can be specified per-package.

Bug: 261486161
Test: ran on crosvm and checked diffs
Change-Id: Iaf3f4732e828a6f8b281f0e63fe1e0e1e9e98631
2023-01-18 11:48:09 -08:00
Yabin Cui
deddd88b27 Update clang-tools build to clang-r475365b
Also remove -std=c++14 flag. Because clang 16 uses c++17
by default. And some headers don't compile with c++14.

Bug: 253033919
Test: run build-prebuilts.sh
Change-Id: Ia76c227831ed62a9de190fb1d816f23d7c92fad2
2023-01-18 10:27:50 -08:00
Hsin-Yi Chen
49db5e9441 Merge "Add a field for arrays of unknown bound" am: 160df5c455 am: e701d73012
Original change: https://android-review.googlesource.com/c/platform/development/+/2385932

Change-Id: I8f14561826830339d3dcef09bd0081b6e6c46de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 03:33:30 +00:00
Hsin-Yi Chen
e701d73012 Merge "Add a field for arrays of unknown bound" am: 160df5c455
Original change: https://android-review.googlesource.com/c/platform/development/+/2385932

Change-Id: I458832ffb3def7388ba67bb8aa6d77ded21dceda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 03:01:01 +00:00
Hsin-Yi Chen
160df5c455 Merge "Add a field for arrays of unknown bound" 2023-01-18 02:12:17 +00:00
Dan Albert
c7e961ef31 Merge changes from topic "restructure-adb.py" am: bf8030234b am: a6ed1573c6
Original change: https://android-review.googlesource.com/c/platform/development/+/2363015

Change-Id: I4f8356bf4347b68fba7beea4fd809e42f83f64d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 20:00:54 +00:00
Dan Albert
a6ed1573c6 Merge changes from topic "restructure-adb.py" am: bf8030234b
Original change: https://android-review.googlesource.com/c/platform/development/+/2363015

Change-Id: I831bd82414497174a3ce59791ad5102fd14511cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 19:27:08 +00:00
Dan Albert
bf8030234b Merge changes from topic "restructure-adb.py"
* changes:
  Fix tests.
  Make this a proper python package.
  Remove python 2 garbage.
  Add type information to adb module.
2023-01-17 18:50:50 +00:00
Shaju Mathew
910896d0a4 Merge "Add py.typed file to export types to dependents." am: 4e13a43693 am: a79de22044
Original change: https://android-review.googlesource.com/c/platform/development/+/2363011

Change-Id: Ifdb6a67c73a29f491078ed9a00e937c287e9d331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 16:53:29 +00:00
Shaju Mathew
a79de22044 Merge "Add py.typed file to export types to dependents." am: 4e13a43693
Original change: https://android-review.googlesource.com/c/platform/development/+/2363011

Change-Id: Ia6abc4852d51e395fd61a2db43f3439ea5d67b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17 16:14:18 +00:00
Shaju Mathew
4e13a43693 Merge "Add py.typed file to export types to dependents." 2023-01-17 15:25:34 +00:00
Hsin-Yi Chen
3a51bf53f1 Add a field for arrays of unknown bound
The ABI tools do not diff the array length. They cannot distinguish
between arrays of unknown bound (e.g., int foo[]) and arrays of zero
length (e.g., int bar[0]). To implement array diff, this commit adds
"is_of_unknown_bound" field to the ABI dumps. It defaults to false so
that it can be omitted for common cases.

Test: ./test.py ; update prebuilts/clang-tools and build
Bug: 255702405
Change-Id: I5db163eb62e95fa01377ef7202e70cc2a0e89524
2023-01-16 17:36:38 +08:00
Dan Albert
808c90cf8d Fix tests.
Bug: None
Test: pytest
Change-Id: Ibe4259750a8d6f1800b5f659a80b301226d6929d
2023-01-13 14:30:19 -08:00
Dan Albert
91e796d227 Make this a proper python package.
Python is picky about directory structure. Ever since python 3 the tests
have not been able to run because the import won't work. This fixes that
problem.

Bug: None
Test: None
Change-Id: I4a626f130e4ca3cd2c9b69804083dfe6daffb5f7
2023-01-13 14:30:19 -08:00
Dan Albert
ac3c9fd05e Remove python 2 garbage.
This code hasn't worked since the python 3 switch, because `unicode`
doesn't exist any more. The problems that this code worked around were
all python 2 problems as well, so it's no longer needed.

Bug: None
Test: ran test.py on windows and mac
Change-Id: Ifacaed5cddc6c9ee9d9d9872c2f2851150ace468
2023-01-13 14:30:18 -08:00
Dan Albert
316dbf5332 Add type information to adb module.
mypy still complains about a few things here, but that looks to be
mostly coming from code that is very, very dead in python 3.

The tests don't run, and haven't since the python 3 switch. Will try to
revive those next, but it likely requires moving files around to fix the
package structure (source needs to go in a subdirectory to make a real
package, as do the tests).

Bug: None
Test: mypy . && pylint .
Change-Id: Ide55a41babecbd6684b73787b17e7f5fdb81c090
2023-01-13 14:30:18 -08:00
Xin Li
cba935f766 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: beb6ac7802 -s ours
am skip reason: Merged-In Ia275a2ab69ee31b7d81a2ca8c83bef08cbf107df with SHA-1 0d7a50767b is already in history

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

Change-Id: I68beb4ad7f3671155c7571ab3b91f772df6945fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 08:08:15 +00:00
Xin Li
beb6ac7802 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: Ia275a2ab69ee31b7d81a2ca8c83bef08cbf107df
Change-Id: I7d4f8d91bb43f0094687c9bc74bda2d7aef3d124
2023-01-11 22:46:07 -08:00
Sekyeong
4a9a733d6b Add FLAG_IMMUTABLE in DevTools app
Happened IllegalArgumentException on DevTools app.
  package : com.android.development
Because PendingIntent requires that one of FLAG_IMMUTABLE or FLAG_MUTABLE.

Test : DevTools - Connectivity - press START SCREEN TOGGLE button

Change-Id: I998c74f974d8f555e8016b2a319e1a9a4a4f2669
Signed-off-by: Sekyeong <sekyeong.heo@samsung.com>
2023-01-11 13:02:51 +09:00
Nataniel Borges
1bd36f31b6 [DO NOT MERGE] Update adb proxy on tm-qpr-dev am: 48ef808621
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20927923

Change-Id: I12a960e8046075c8a37fbe1590ba632ec028f996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 13:19:37 +00:00
Nataniel Borges
48ef808621 [DO NOT MERGE] Update adb proxy on tm-qpr-dev
This will help those working on tm-dev to run the new winscope, without having to download an additional file.

Change-Id: I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1
Fixes: 264719130
Test: run the proxy, open go/winscope and check if it can collect traces
2023-01-10 10:22:22 +00:00
Hsin-Yi Chen
0dff861946 Merge "Fix the bug that generates multiple definition of references" am: e07e343451 am: 2706b0c951
Original change: https://android-review.googlesource.com/c/platform/development/+/2379448

Change-Id: Ib40747a9e97d000d9d4982fe13a685a04af15dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 04:24:09 +00:00
Hsin-Yi Chen
2706b0c951 Merge "Fix the bug that generates multiple definition of references" am: e07e343451
Original change: https://android-review.googlesource.com/c/platform/development/+/2379448

Change-Id: I4cc76c834250bc5d6689bf964e13ed98324137cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 03:37:38 +00:00
Hsin-Yi Chen
e07e343451 Merge "Fix the bug that generates multiple definition of references" 2023-01-10 03:08:11 +00:00
Nataniel Borges
ed61429250 Merge "Update winscope proxy to version 1.0" am: 20b563e65e am: 1130743c2c
Original change: https://android-review.googlesource.com/c/platform/development/+/2379888

Change-Id: Ic5ccb4f15ce4830c71d52fae6d7c9a9d1e04b6b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-09 13:45:14 +00:00
Nataniel Borges
1130743c2c Merge "Update winscope proxy to version 1.0" am: 20b563e65e
Original change: https://android-review.googlesource.com/c/platform/development/+/2379888

Change-Id: I1894ab90588fea38cfee89286a339eab36a91b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-09 13:12:48 +00:00
Nataniel Borges
20b563e65e Merge "Update winscope proxy to version 1.0" 2023-01-09 12:36:09 +00:00
Nataniel Borges
7353794edc Update winscope proxy to version 1.0
Bug: 264573983
Change-Id: Ie7e14b11c3b3a866a649b4e013a60fe542d3d754
Test: open winscope and proxy and dump wm and sf states
2023-01-09 12:14:09 +00:00
Hsin-Yi Chen
6e5894f6a2 Fix the bug that generates multiple definition of references
If a type ID is persent in local_to_global_type_id_map,
ModuleMerger functions should report that was_newly_added_ = false.

Test: ./test.py ; update prebuilts/clang-tools and build
Bug: 255702405
Change-Id: I0fbe68ebbc6b8df3ea4ae36a017d0bb61bc7d553
2023-01-07 16:24:43 +08:00
Treehugger Robot
0f8496ddd3 Merge "Revert "Provide a script to update the generated Android.bp"" am: a8802bc47a am: 61b1a8bb12
Original change: https://android-review.googlesource.com/c/platform/development/+/2373488

Change-Id: Ied36e079508f43ba458636b667b81ac4b367aa54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 06:40:04 +00:00
Treehugger Robot
61b1a8bb12 Merge "Revert "Provide a script to update the generated Android.bp"" am: a8802bc47a
Original change: https://android-review.googlesource.com/c/platform/development/+/2373488

Change-Id: Ifee80edd8427b45c80ff662ac07ac382a46e6e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 05:51:18 +00:00
Treehugger Robot
a8802bc47a Merge "Revert "Provide a script to update the generated Android.bp"" 2023-01-03 05:19:58 +00:00
Justin Yun
699b519ec1 Revert "Provide a script to update the generated Android.bp"
This reverts commit c7c0e42748.

Reason for revert: This workaround is no longer required.

Change-Id: If85cb87c2af02b321bfa484bdfe791ede144d490
2023-01-02 07:12:19 +00:00
Hsin-Yi Chen
aa64717b4d Merge "Determine struct extensions before calling IRDiffDumper" am: 25a02ee161 am: 90dd62487d
Original change: https://android-review.googlesource.com/c/platform/development/+/2363619

Change-Id: I2b1302a328173ab5ad8a11a84304855f253bbcb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-30 11:22:11 +00:00
Hsin-Yi Chen
90dd62487d Merge "Determine struct extensions before calling IRDiffDumper" am: 25a02ee161
Original change: https://android-review.googlesource.com/c/platform/development/+/2363619

Change-Id: I008131f0e8f256fac8176385bf3d474b22357ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-30 10:48:28 +00:00
Hsin-Yi Chen
25a02ee161 Merge "Determine struct extensions before calling IRDiffDumper" 2022-12-30 09:55:24 +00:00
Hsin-Yi Chen
a062a6cf35 Determine struct extensions before calling IRDiffDumper
This commit moves the functions that determine struct extensions from
ir_diff_representation.cpp to abi_diff_helpers.cpp. The functions
are called before IRDiffDumper so that the IR and the dumper do not
include the diff logic.

Test: ./test.py
Bug: 259148872
Change-Id: I93aaa3028bf6a30312f0b0e5b1ef5f6ae1041f21
2022-12-30 16:33:48 +08:00