Commit Graph

31837 Commits

Author SHA1 Message Date
Christopher Ferris
f5ce992a21 Merge "Small script fixes." am: 0d4977e7cd am: 0b29aa1937 am: ad2ec44db5 am: 45b9975a24
Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: I96b8c92ee19134b58bd585e695d91ee6c7ccff68
2021-10-21 04:32:37 +00:00
Christopher Ferris
45b9975a24 Merge "Small script fixes." am: 0d4977e7cd am: 0b29aa1937 am: ad2ec44db5
Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: I601284212d3cdebb7996d11407227ba27faecc56
2021-10-21 04:18:17 +00:00
Christopher Ferris
ad2ec44db5 Merge "Small script fixes." am: 0d4977e7cd am: 0b29aa1937
Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: I28a8bcd33c9a6309c0304a2d7e7d4869084763aa
2021-10-21 03:54:12 +00:00
Christopher Ferris
0b29aa1937 Merge "Small script fixes." am: 0d4977e7cd
Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: Idb30b1d0edee49f9e8359385df2fb1933ec53e06
2021-10-21 03:39:35 +00:00
Christopher Ferris
0d4977e7cd Merge "Small script fixes." 2021-10-21 03:27:23 +00:00
Christopher Ferris
7ea56f02c8 Small script fixes.
Fix a problem with python3 and the zipinfo processing of an apk.

Add sorting of the zipinfo data since it's not guaranteed that
the zip entries will be in sorted order, so sort them.

Bug: https://github.com/android/ndk/issues/1587

Test: Ran a apk stack line through the script.
Test: Ran the stack core unit tests.
Change-Id: Ie5ea67ad54a6b2de077e53740c82265f6bf783c6
2021-10-21 00:35:13 +00:00
Treehugger Robot
8861cdeedf Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2 am: af61d8ca10 am: dbc20bf1cc am: 38cf43a65d
Original change: https://android-review.googlesource.com/c/platform/development/+/1865694

Change-Id: I12a1a85a7c676d597f8c49571662d4fe8bfa2f8e
2021-10-21 00:08:54 +00:00
Treehugger Robot
38cf43a65d Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2 am: af61d8ca10 am: dbc20bf1cc
Original change: https://android-review.googlesource.com/c/platform/development/+/1865694

Change-Id: Ifef72863be385855a82cbd15db6fe3fdc983bf8a
2021-10-20 23:49:43 +00:00
Treehugger Robot
dbc20bf1cc Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2 am: af61d8ca10
Original change: https://android-review.googlesource.com/c/platform/development/+/1865694

Change-Id: I875829ace69d1a52f325f33c71cce252371c26f7
2021-10-20 23:33:45 +00:00
Treehugger Robot
af61d8ca10 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2
Original change: https://android-review.googlesource.com/c/platform/development/+/1865694

Change-Id: I5595dbd52e1c8b4e4500342bb130ba28b706df56
2021-10-20 23:19:04 +00:00
Treehugger Robot
44150bc2e2 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" 2021-10-20 22:49:14 +00:00
Bob Badour
665239b180 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/OBJViewer/Android.bp
  build/Android.bp
  samples/HeavyWeight/Android.bp
  samples/MySampleRss/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Ifea680956185592ef0d06e29201da596451b3996
2021-10-20 14:13:22 -07:00
Joel Galenson
493c26a8d4 Document the expectations of two arguments.
To work with the updater, these files must have a certain prefix.

Test: Run with --help and upgrade a crate.
Change-Id: Icdc492479223865c39d6c6f10b84fe3d762f5d1d
2021-10-18 15:54:41 -07:00
Joel Galenson
11bd577f8e Merge "Do not generate empty Rust tests." am: 4506b51f47 am: 99f7bbcd14 am: 04ea9aa94a am: 188b30b20d
Original change: https://android-review.googlesource.com/c/platform/development/+/1858470

Change-Id: I68d3d5f89f6cc945bd7f37b064b1c02e5c93d6ab
2021-10-18 18:33:35 +00:00
Joel Galenson
188b30b20d Merge "Do not generate empty Rust tests." am: 4506b51f47 am: 99f7bbcd14 am: 04ea9aa94a
Original change: https://android-review.googlesource.com/c/platform/development/+/1858470

Change-Id: Ib9ee84101cd39556494442b72d1d61d953ce2b67
2021-10-18 18:19:11 +00:00
Joel Galenson
04ea9aa94a Merge "Do not generate empty Rust tests." am: 4506b51f47 am: 99f7bbcd14
Original change: https://android-review.googlesource.com/c/platform/development/+/1858470

Change-Id: I38d358fbbb45fa261b9b9e5a2a78f78162b6df54
2021-10-18 17:53:43 +00:00
Joel Galenson
99f7bbcd14 Merge "Do not generate empty Rust tests." am: 4506b51f47
Original change: https://android-review.googlesource.com/c/platform/development/+/1858470

Change-Id: Ic9098295ccd98a8fbbab74fba99bafbb0e506dae
2021-10-18 17:36:22 +00:00
Joel Galenson
4506b51f47 Merge "Do not generate empty Rust tests." 2021-10-18 17:21:43 +00:00
Anton Hansson
1718ea4476 Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981 am: 6ca55f583c am: 247163d8fa am: 6f027103d2
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: I151e9b08f84fa97a362dc86461cc3a490391a400
2021-10-18 10:53:24 +00:00
Anton Hansson
6f027103d2 Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981 am: 6ca55f583c am: 247163d8fa
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: If7bd94e7c0809f16308e841eefe94fb916a87a74
2021-10-18 10:35:38 +00:00
Anton Hansson
247163d8fa Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981 am: 6ca55f583c
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: Ib804d5b9a5e75f3b8952b7f7a10cbb9026ba489d
2021-10-18 10:17:45 +00:00
Anton Hansson
6ca55f583c Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: I9f2bda05da53d9adab5c19f23a92f67eae74f2f7
2021-10-18 10:07:13 +00:00
Anton Hansson
ed19ee5981 Merge "Use generated merged annotations.zip in SDK build" 2021-10-18 09:54:05 +00:00
Treehugger Robot
05ec491fef Merge "Remove sdk-linux-x86.atree as well" am: 9cf4face61 am: f9c6180263 am: c7fd992149 am: 337af225ba
Original change: https://android-review.googlesource.com/c/platform/development/+/1860413

Change-Id: I409517c44eb79b9d1d1600f03f594d40bf63d40b
2021-10-17 03:23:31 +00:00
Treehugger Robot
337af225ba Merge "Remove sdk-linux-x86.atree as well" am: 9cf4face61 am: f9c6180263 am: c7fd992149
Original change: https://android-review.googlesource.com/c/platform/development/+/1860413

Change-Id: I96e909a6ccd3c0945a7c053ea4ed0dc5da8f5d4a
2021-10-17 03:11:24 +00:00
Treehugger Robot
c7fd992149 Merge "Remove sdk-linux-x86.atree as well" am: 9cf4face61 am: f9c6180263
Original change: https://android-review.googlesource.com/c/platform/development/+/1860413

Change-Id: I81ec36ed87ab2fe3edd14908d1a69791a6d5836d
2021-10-17 02:57:13 +00:00
Treehugger Robot
f9c6180263 Merge "Remove sdk-linux-x86.atree as well" am: 9cf4face61
Original change: https://android-review.googlesource.com/c/platform/development/+/1860413

Change-Id: I5941e78a43b785d2d77c3d140cfbd13aa4fcfd33
2021-10-17 02:37:40 +00:00
Treehugger Robot
9cf4face61 Merge "Remove sdk-linux-x86.atree as well" 2021-10-17 02:21:46 +00:00
Dan Willemsen
836f968022 Remove sdk-linux-x86.atree as well
I missed this one in my last change.

Bug: 187222815
change-Id: Ibd2951f5b8d193295047a00bde2db21d81dabb89
2021-10-16 16:52:07 -07:00
Treehugger Robot
e6b552069c Merge "Remove old build-tools/platform-tools implementation" am: f3901792cd am: 2582be0659 am: 83ea68a3df am: c08309675a
Original change: https://android-review.googlesource.com/c/platform/development/+/1859740

Change-Id: I3458bcde76c6fca6b5b3b9be989e20e29f65b6e7
2021-10-16 21:13:40 +00:00
Treehugger Robot
c08309675a Merge "Remove old build-tools/platform-tools implementation" am: f3901792cd am: 2582be0659 am: 83ea68a3df
Original change: https://android-review.googlesource.com/c/platform/development/+/1859740

Change-Id: Ibd16afc1eaf292865f98e40dd8eb687a11377618
2021-10-16 20:59:15 +00:00
Treehugger Robot
83ea68a3df Merge "Remove old build-tools/platform-tools implementation" am: f3901792cd am: 2582be0659
Original change: https://android-review.googlesource.com/c/platform/development/+/1859740

Change-Id: I4782dcd6f571e6a82130004dd8dd48d4215bba97
2021-10-16 20:40:45 +00:00
Treehugger Robot
2582be0659 Merge "Remove old build-tools/platform-tools implementation" am: f3901792cd
Original change: https://android-review.googlesource.com/c/platform/development/+/1859740

Change-Id: I6c7ffc0df732ff5ee4d2066682bc8115497e89f2
2021-10-16 20:30:30 +00:00
Treehugger Robot
f3901792cd Merge "Remove old build-tools/platform-tools implementation" 2021-10-16 20:20:33 +00:00
Dan Willemsen
53052e34be Remove old build-tools/platform-tools implementation
These packages are now built with Soong. Since they were the only two
outputs of the windows SDK package, I've also removed that
implementation.

Bug: 187222815
Change-Id: Ib42687cfe79c40066a49d20980a0f6f75914406a
2021-10-15 13:39:11 -07:00
Joel Galenson
7cfc6fe5de Do not generate empty Rust tests.
cargo2android.py currently builds whatever cargo does, which includes
empty tests.  We can filter those out by parsing the output of "cargo
test" and looking for things with no tests.

Fixes: 159039990
Test: Run on a crate with empty integration tests, one with empty unit
tests, and one with no empty tests.

Change-Id: If8b1126d82ce6c2851b90de738ea24b129b81feb
2021-10-15 13:35:41 -07:00
Treehugger Robot
68e3c834bc Merge "Add Android.bp-based definitions for host sdk-repos" am: 036ddeba4c am: ea1db82614 am: 50fd203cf7 am: 2bd9535f87
Original change: https://android-review.googlesource.com/c/platform/development/+/1827791

Change-Id: I57fd2d9b5717fbb0315e53f3a940307a5f5ea3bd
2021-10-15 20:26:46 +00:00
Treehugger Robot
2bd9535f87 Merge "Add Android.bp-based definitions for host sdk-repos" am: 036ddeba4c am: ea1db82614 am: 50fd203cf7
Original change: https://android-review.googlesource.com/c/platform/development/+/1827791

Change-Id: I52fc1944441a89de6becce63f5fe56114552d24f
2021-10-15 20:10:31 +00:00
Treehugger Robot
50fd203cf7 Merge "Add Android.bp-based definitions for host sdk-repos" am: 036ddeba4c am: ea1db82614
Original change: https://android-review.googlesource.com/c/platform/development/+/1827791

Change-Id: I0d15354a0546da9b4e3beb4c3204d66575b40a57
2021-10-15 19:52:03 +00:00
Treehugger Robot
ea1db82614 Merge "Add Android.bp-based definitions for host sdk-repos" am: 036ddeba4c
Original change: https://android-review.googlesource.com/c/platform/development/+/1827791

Change-Id: I9d7ff70eadd9a27a7caed1eab88c651921c37d28
2021-10-15 19:28:10 +00:00
Treehugger Robot
036ddeba4c Merge "Add Android.bp-based definitions for host sdk-repos" 2021-10-15 19:21:43 +00:00
Anton Hansson
2918f63267 Use generated merged annotations.zip in SDK build
The framework-doc-stubs is being transitioned to use module jar stub
source as input, at which point it will stop producing correct
annotations.zip files. Replace the annotations zip file in the sdk
with the one generated from all the constituent parts.

Bug: 187397779
Test: diff sdk.zip before && after (only whitespace diffs in annotations)
Change-Id: I56b22bf4909105a2720221c8de35b517a6e66a3c
2021-10-15 14:50:56 +01:00
Priyanka
2b5b9d7919 Edit SF and WM config from winscope. am: 5284e5a483
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16047809

Change-Id: I2b50e786984ca93f5d5803522f9bf49b41caf30a
2021-10-13 16:46:53 +00:00
Priyanka
5284e5a483 Edit SF and WM config from winscope.
Can now set the buffer sizes for these two traces, as well as set
tracing level and type for WM. Tested for multiple combinations of
config settings, as well as if settings are left as
placeholders/selected as the name of the config.

Bug: b/200159899

Test: Run a SF/WM trace with arbitrary config settings and check that all loads as normal.

Merged-In: I50ccc271bd2f90dba1d22c3e8c568490c4bf831f
Change-Id: I50ccc271bd2f90dba1d22c3e8c568490c4bf831f
(cherry picked from commit 9d3f674027)
2021-10-13 15:20:22 +00:00
Dan Willemsen
17df46e334 Add Android.bp-based definitions for host sdk-repos
So that these can be built independently from the large sdk zip. The old
Make-based implementation created this as part of the large sdk zip,
then extracted it from that zip file.

This topic only adds the new definitions under a different filename,
full replacement will come in a follow-on CL.

Once we fully transitions to this mechanism, we'll be able to turn down
most modules on Macs, only building these and their dependencies.

Bug: 187222815
Change-Id: If6be8dd573a323ef8b343bc86116ffa3d43922a5
2021-10-12 20:45:15 -07:00
Huan Song
e7a728a82e Merge "Enable "auto rotate" for resizable AVD" into sc-v2-dev am: 881e6d0264
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/16029130

Change-Id: I1ffb923a21f0544b4c7ce3f3e96f973c2d04d931
2021-10-12 23:01:02 +00:00
Huan Song
881e6d0264 Merge "Enable "auto rotate" for resizable AVD" into sc-v2-dev 2021-10-12 22:43:41 +00:00
Huan Song
7085983d97 Enable "auto rotate" for resizable AVD
Bug: 202734687

Test: run resizable AVD
Change-Id: I3b104fe680e1c706ce11974473140dfbbb1a83ff
2021-10-11 13:00:28 -07:00
Joel Galenson
c36927f3aa Merge "Do not generate cargo_pkg_version when --no-pkg-vers is passed" am: f78de4f942 am: 9bbb76e144 am: 3497b061cc am: 647214b144
Original change: https://android-review.googlesource.com/c/platform/development/+/1838728

Change-Id: I61da20fb5323f9763d0be42edb2fcd4f6bcbea5e
2021-10-08 22:12:03 +00:00
Joel Galenson
647214b144 Merge "Do not generate cargo_pkg_version when --no-pkg-vers is passed" am: f78de4f942 am: 9bbb76e144 am: 3497b061cc
Original change: https://android-review.googlesource.com/c/platform/development/+/1838728

Change-Id: I317342f66ebab949158f9d8480f57eacfa5c786d
2021-10-08 21:57:38 +00:00