Commit Graph

29696 Commits

Author SHA1 Message Date
Joel Galenson
3b014257fa Merge "Do not write out the --no-test-mapping option." am: cedb102822
Original change: https://android-review.googlesource.com/c/platform/development/+/1691526

Change-Id: Ie0c7d08b2570a0225653c0cad63f834e965637a3
2021-04-29 23:44:33 +00:00
Joel Galenson
cedb102822 Merge "Do not write out the --no-test-mapping option." 2021-04-29 23:24:56 +00:00
Joel Galenson
367360cdaf Do not write out the --no-test-mapping option.
This option is only intended to be temporary, so if it is used it
should not "propagate" itself by being added to the Android.bp header
or the config file.

Test: Do not see it in the header or config file.
Change-Id: Ibb18c76bdab26aa47b38ac75ea3c410ddc612856
2021-04-29 14:33:13 -07:00
David Srbecky
89b2239085 Merge "Make the stack script python3.5 compatible." am: ec44e57e10
Original change: https://android-review.googlesource.com/c/platform/development/+/1689066

Change-Id: I3d09ea33052c8bd149938a8ca217bcf1f8e6fc9b
2021-04-29 17:07:38 +00:00
David Srbecky
ec44e57e10 Merge "Make the stack script python3.5 compatible." 2021-04-29 16:48:07 +00:00
Yo Chiang
2d4c1f67b8 Merge "repo-review: Add a 'restore' command line option" am: 6a454c160e
Original change: https://android-review.googlesource.com/c/platform/development/+/1686051

Change-Id: Ib353b7b0fc7abd191f6ca7ac957a16af2634ed04
2021-04-29 05:33:51 +00:00
Yo Chiang
6a454c160e Merge "repo-review: Add a 'restore' command line option" 2021-04-29 05:11:23 +00:00
Treehugger Robot
f9acf16725 Merge changes from topic "c2a-apex" am: 2d7bce0b3b
Original change: https://android-review.googlesource.com/c/platform/development/+/1686814

Change-Id: I716ef428d904edc10c63bc8d2dab3ac5377fcf01
2021-04-28 15:08:55 +00:00
Joel Galenson
6c63da7a86 Allow cargo2android.py to use a config file instead of command-line options. am: 0fbdafe016
Original change: https://android-review.googlesource.com/c/platform/development/+/1686813

Change-Id: I52e99dde41496cdd19fcb7a0600d114fec8b515a
2021-04-28 15:08:47 +00:00
Treehugger Robot
2d7bce0b3b Merge changes from topic "c2a-apex"
* changes:
  Let cargo2android.py generate apex_available and min_sdk_version.
  Allow cargo2android.py to use a config file instead of command-line options.
2021-04-28 14:50:54 +00:00
David Srbecky
fd1e41623d Make the stack script python3.5 compatible.
Ensure that the script works on buildbots.

Test: adb shell debuggerd -b <pid> | development/scripts/stack
Change-Id: I3fd4a0ed78ff3245d1ab2f6e842446888c5c7b8b
2021-04-27 22:24:36 +01:00
Joel Galenson
d9c4de6fe3 Let cargo2android.py generate apex_available and min_sdk_version.
This commit adds an --apex-available option to cargo2android.py.  It
takes in multiple strings that are included in the generated block.

It also adds --min-sdk-version.

Test: Use flags.
Change-Id: I319a32fc5e8be11015ba4484b0ab1665ee457326
2021-04-26 11:34:15 -07:00
Joel Galenson
0fbdafe016 Allow cargo2android.py to use a config file instead of command-line options.
The command-line options to c2a are already long and will only get
longer as new arguments are added.  This allows it to load them from a
config file.  For simplicity of implementation, the config file
supplements the command-line arguments and uses the same format they
do, although it ideally will replace them over time.

This also adds an option to dump the current set of command-line
arguments to a config file and exit.  This is intended to ease
migration over to the config file: for a given crate, we can call c2a
with its command-line arguments plus this new flag to generate the
config file and then use just that instead.

Test: Dump and load some config files.
Change-Id: I63b29dd20bcff5d5832dbd380d7c6eb273547ed0
2021-04-26 11:33:52 -07:00
Treehugger Robot
eb2f1dceae Merge "[SdkSetup] Add open network "AndroidWifi"" am: d69af024bc
Original change: https://android-review.googlesource.com/c/platform/development/+/1679686

Change-Id: I8f9bb21379094776068c33c433e00eac8a247dc9
2021-04-26 16:17:25 +00:00
Treehugger Robot
d69af024bc Merge "[SdkSetup] Add open network "AndroidWifi"" 2021-04-26 15:39:40 +00:00
Taesu Lee
6c7a793c78 repo-review: Add a 'restore' command line option
This CL enables repo_review.py to restore CL(s).

Test: repo-review.py -g [url] [query] --restore

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Ia1e84b35dbae453feba338fea1d1f101620cfa06
2021-04-26 11:54:25 +09:00
Weilun Du
cedad08727 [SdkSetup] Add open network "AndroidWifi"
Instead of relying on WifiConfigStore.xml, we configure Wifi in SdkSetup
to make data partition empty at build team.

Bug: 185242318

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I0f5d7f3a6e67414f4213f98b7f3b0b19e7cc129c
2021-04-23 22:54:21 -07:00
Treehugger Robot
347249060a Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: e748063d28
Original change: https://android-review.googlesource.com/c/platform/development/+/1682225

Change-Id: I53029b6fe7286287bf85a1e119bcd4ea889f0a58
2021-04-21 19:01:41 +00:00
Treehugger Robot
e748063d28 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" 2021-04-21 18:21:22 +00:00
Søren Gjesse
a2c173be97 Merge "Remove DX from the SDK" am: a5b6f93ff2
Original change: https://android-review.googlesource.com/c/platform/development/+/1681270

Change-Id: Icfbf5bf6a2b8d535f3fb9f637c6cdfebf8172d12
2021-04-21 10:03:05 +00:00
Søren Gjesse
a5b6f93ff2 Merge "Remove DX from the SDK" 2021-04-21 09:38:04 +00:00
Bob Badour
40a7447daa [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/Development/Android.mk
  apps/DumpViewer/app/src/main/Android.mk
  apps/OBJViewer/Android.bp
  samples/ApiDemos/Android.mk
  samples/ApiDemos/tests/Android.mk
  samples/HeavyWeight/Android.bp
  samples/IntentPlayground/Android.mk
  samples/MultiClientInputMethod/Android.mk
  samples/MultiDisplay/Android.mk
  samples/MySampleRss/Android.bp
  samples/RenderScript/HelloCompute/Android.mk
  samples/RenderScript/Levels/Android.mk
  samples/ShortcutDemo/launcher/Android.mk
  samples/ShortcutDemo/publisher/Android.mk
  samples/ShortcutSample/Android.mk
  testrunner/tests/Android_java.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I535f73ffa885f723b9dca745f199ce3a3fd409ea
2021-04-20 14:03:26 -07:00
Søren Gjesse
005a6f340f Remove DX from the SDK
Deprecation and removal of support of DX was announced here:
https://android-developers.googleblog.com/2020/02/the-path-to-dx-deprecation.html.

There is says:

As of On Feb 1st, 2021, we’ll move to step 3, removing DX fully from
Android Studio and any other build environments.

Test: m sdk
Test: m win_sdk
Bug: 185479734
Bug: 73711890

Change-Id: I2fdbab7ce7ab50a637baf523ae5c2e87ab01fb8c
2021-04-20 16:55:43 +00:00
Søren Gjesse
783a0df53e Merge "Revert "Remove DX from the SDK"" am: 4e005d8a1c
Original change: https://android-review.googlesource.com/c/platform/development/+/1679488

Change-Id: Ie73fafb5923760e30d96890a3ff5389a51072028
2021-04-19 14:51:06 +00:00
Søren Gjesse
4e005d8a1c Merge "Revert "Remove DX from the SDK"" 2021-04-19 14:29:33 +00:00
Søren Gjesse
a62cbeefdf Revert "Remove DX from the SDK"
This reverts commit 97c4f4304a.

Reason for revert: Build breakage

Change-Id: I24db691da0ff4bfdf95db611928084486183b3a7
2021-04-19 14:26:56 +00:00
Søren Gjesse
bc3752e0aa Merge "Remove DX from the SDK" am: 5064ab0df2
Original change: https://android-review.googlesource.com/c/platform/development/+/1677226

Change-Id: Ia8522af586563bc04c6adc5316aaf4cce729a251
2021-04-19 14:00:16 +00:00
Søren Gjesse
5064ab0df2 Merge "Remove DX from the SDK" 2021-04-19 13:39:34 +00:00
Søren Gjesse
97c4f4304a Remove DX from the SDK
Deprecation and removal of support of DX was announced here:
https://android-developers.googleblog.com/2020/02/the-path-to-dx-deprecation.html.

There is says:

As of On Feb 1st, 2021, we’ll move to step 3, removing DX fully from
Android Studio and any other build environments.

Test: m sdk
Bug: 185479734
Bug: 73711890
Change-Id: I2d7601037ed4135e00cf48b4b9f490a86fec90cb
2021-04-19 13:39:03 +00:00
Pirama Arumuga Nainar
fb1cac7d60 Merge "Use clang-r416183b for clang-tools build" am: 5a81e1cf66
Original change: https://android-review.googlesource.com/c/platform/development/+/1676650

Change-Id: Ied9761ba483d9659cb3084cc9c5024666a11af1f
2021-04-16 21:18:07 +00:00
Pirama Arumuga Nainar
5a81e1cf66 Merge "Use clang-r416183b for clang-tools build" 2021-04-16 20:54:08 +00:00
Pirama Arumuga Nainar
87bb0c5790 Use clang-r416183b for clang-tools build
Bug: http://b/185528062

header-checker updates:
- Remove typedef that's no longer necessary.
- Use new return type for ElfObjectFile::getSymbol()

Test: OUT_DIR=out prebuilts/clang-tools/build-prebuilts.sh
Change-Id: I9ecff7790a71edf16710abe0dae3014ae93df84a
2021-04-16 00:14:30 +00:00
Pedro Loureiro
5715d5e802 Merge "Add lint baseline to address NewApi errors" am: ba0fbb2ed0
Original change: https://android-review.googlesource.com/c/platform/development/+/1675569

Change-Id: I67c1a3266eb8146e1afcddd9bbeb5734546120fd
2021-04-15 11:49:50 +00:00
Pedro Loureiro
ba0fbb2ed0 Merge "Add lint baseline to address NewApi errors" 2021-04-15 11:03:48 +00:00
Pedro Loureiro
2dc09c2150 Add lint baseline to address NewApi errors
We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.

Bug: 150847901

Test: m lint-check
Change-Id: I994630133d86cedb7f10eb51282dad0071df0d87
Merged-In: I994630133d86cedb7f10eb51282dad0071df0d87
2021-04-14 10:30:53 +00:00
Inseob Kim
8074499ccf Merge "Reexport vndk for vendor snapshot modules" am: c6f1ad7cb1
Original change: https://android-review.googlesource.com/c/platform/development/+/1673128

Change-Id: I9fd1ee14d6f1b14e9f2f935104f22d900fd98a71
2021-04-14 00:31:34 +00:00
Inseob Kim
c6f1ad7cb1 Merge "Reexport vndk for vendor snapshot modules" 2021-04-13 23:46:13 +00:00
Christopher Ferris
7d1443fa38 Merge "Upgrade the 'stack' script to python3." am: ed37bd6420
Original change: https://android-review.googlesource.com/c/platform/development/+/1668508

Change-Id: I781a38c4d8b0b3ec292411665c2fb19dc34805f3
2021-04-12 20:54:24 +00:00
Christopher Ferris
ed37bd6420 Merge "Upgrade the 'stack' script to python3." 2021-04-12 20:10:24 +00:00
Inseob Kim
c0c754211e Reexport vndk for vendor snapshot modules
Bug: 184795475
Test: run update.py with fake snapshot and see Android.bp
Change-Id: I5f3032574b957edaecf0dfa9f5e0c7981670d25a
2021-04-12 21:11:29 +09:00
Krzysztof Kosiński
b136111f17 Upgrade the 'stack' script to python3.
Also hook up the test to Android.bp.

Test: unit test
Test: Ran with a tombstone file as parameter.
Test: Ran pasting in stack to stdin.
Change-Id: I25f40569cc49b7487553611bcc25d061179bfa8d
2021-04-09 13:21:32 -07:00
Thiébaud Weksteen
4c7b520759 Merge "cargo2android: Use cfgs property" am: ea57fde601
Original change: https://android-review.googlesource.com/c/platform/development/+/1669987

Change-Id: I1bf66bda0ebe1682a2779699f5a93db837cdbefc
2021-04-08 18:39:50 +00:00
Thiébaud Weksteen
ea57fde601 Merge "cargo2android: Use cfgs property" 2021-04-08 17:53:54 +00:00
Thiébaud Weksteen
a5a728b4c8 cargo2android: Use cfgs property
Test: Run cargo2android on multiple crates, verify Android.bp
Bug: 183727250
Change-Id: I087ffb0de33db7a09735d2e9c668d991c9f5bb49
2021-04-08 14:23:49 +02:00
Jose "Pepe" Galmes
3590ee637a Merge "Revert "Add support to androidmk_suffix prop"" am: bc2a5a25ee
Original change: https://android-review.googlesource.com/c/platform/development/+/1664085

Change-Id: Ifa072f793605d6dcb7d71cca05bc296faaa0c40a
2021-04-07 22:57:31 +00:00
Treehugger Robot
d412fadf8d Merge "NFC: Refactor a string so we can add a comment to it." am: ad8e4d2a7e
Original change: https://android-review.googlesource.com/c/platform/development/+/1667709

Change-Id: Ibb03a67ce931da6a35ae692ce03ea8c57a49bb0a
2021-04-07 22:57:06 +00:00
Joel Galenson
4c0bf9ff7b Merge "Add a cargo2android flag to disable generating TEST_MAPPING." am: 4d82acfeee
Original change: https://android-review.googlesource.com/c/platform/development/+/1667071

Change-Id: I15d9dd15b920f403c1a6bb4b073fd9cf4abdd111
2021-04-07 22:56:50 +00:00
Treehugger Robot
47aad36a67 Merge "Fix cargo2android's license block preservation" am: dddc6e0873
Original change: https://android-review.googlesource.com/c/platform/development/+/1663858

Change-Id: I961b9db90f9e3fd1adc680be560bcc48c05cfff1
2021-04-07 22:56:27 +00:00
Jose "Pepe" Galmes
bc2a5a25ee Merge "Revert "Add support to androidmk_suffix prop"" 2021-04-07 22:29:50 +00:00
Treehugger Robot
ad8e4d2a7e Merge "NFC: Refactor a string so we can add a comment to it." 2021-04-07 22:15:50 +00:00