Commit Graph

29695 Commits

Author SHA1 Message Date
Joel Galenson
7e8247e2eb Abort cargo2android.py if the patch fails.
This allows the external_updater to understand that an error occurred.

The pre-patched version of the file will still exist.

Test: Run when a patch fails.
Change-Id: I59cc12eeaa751b5e3e2956060f58981d27875748
2021-05-24 15:31:08 -07:00
Joel Galenson
5774c85c70 Raise an exception if we encountered an error.
This allows the caller to handle it if they wish.

Test: Call with an error.
Change-Id: Ia2e0d38e8e486a2b78e42d154654332e88909e9f
2021-05-24 15:31:08 -07:00
Roland Levillain
1f1a79d97d Merge "Print the coverage report location at the end of acov-llvm.py report." 2021-05-21 19:28:39 +00:00
Roland Levillain
d2f1236a6e Print the coverage report location at the end of acov-llvm.py report.
This makes it easier to identify the directory where the coverage
report data of the latest `acov-llvm.py report` was written,
especially when the current directory already contains previous
coverage reports.

Test: acov-llvm.py report
Bug: 160401633
Change-Id: I96fc860940f5be11c4c3b702dfce74226afabfce
2021-05-21 17:36:13 +01:00
Julien Desprez
59189ecc35 Merge "Attempt to run python-stack_core_test" 2021-05-21 01:04:24 +00:00
Treehugger Robot
0b1aa4958f Merge "When cargo errors, print an error about cargo.out." 2021-05-18 04:05:19 +00:00
Joel Galenson
6bf54e3abb When cargo errors, print an error about cargo.out.
Currently if cargo produces an error it's not obvious how to debug it.
Add a message telling the user to look at the cargo.out file, which
has its output.

Test: Ran on crates with and without errors
Change-Id: Ib681a8e87f60467c7425aed5f7e5277a0603bcc8
2021-05-17 10:54:50 -07:00
Roland Levillain
97988980d0 Merge "Fix adb root invocations in script acov-llvm.py." 2021-05-14 16:35:08 +00:00
Treehugger Robot
f205499be8 Merge "Add support for vndk llndk libraries in Android.bp" 2021-05-14 07:55:48 +00:00
Bill Peckham
dba5e0f214 Add support for vndk llndk libraries in Android.bp
Now that the vndk includes llndk libraries, we must also create the
modules for them in the generated Android.bp files.
llndk must not define `vndk.enabled: true` and will not be included
vndk apexes.
No changes on vndk v30 and earlier snapshot versions.

Bug: 187963715
Bug: 181815415
Test: python3 development/vndk/snapshot/update.py --use-current-branch --local <dir> <ver>
Change-Id: Ic33d169cc089199e5a742990f6ecfb08c1858288
2021-05-14 11:53:05 +09:00
Roland Levillain
d203b9e692 Fix adb root invocations in script acov-llvm.py.
Test: acov-llvm.py clean-device
Bug: 160401633
Change-Id: Ie41e13a7ab81994b8fed91ac07e32c6b90b91e74
2021-05-13 16:20:54 +01:00
Treehugger Robot
37f061b11a Merge "Add <uses-library> information." 2021-05-11 16:06:39 +00:00
Ulya Trafimovich
bca9632895 Add <uses-library> information.
LOCAL_USES_LIBRARIES / LOCAL_OPTIONAL_USES_LIBRARIES should be added to
the app's Android.mk module and should match <uses-library> tags in the
app's manifest, so that the build knows about these libraries and
generates correct class loader context for dexpreopt.

Bug: 132357300
Test: m out/target/common/obj/APPS/Development_intermediates/enforce_uses_libraries.status
Change-Id: Ie5e36dd60040a1e7653acdf882e006de513f5367
Merged-In: Ie5e36dd60040a1e7653acdf882e006de513f5367
(cherry picked from commit 247d38afd5)
2021-05-11 14:27:46 +01:00
Treehugger Robot
4b4bf9f755 Merge "monkey: Use java_binary" 2021-05-09 01:42:11 +00:00
Luca Stefani
5f4839eb99 monkey: Use java_binary
* cc_prebuilt_binary triggers strip and fails

* Currently it's only printing to stdout but
  it may later on be a build failure

Change-Id: I6a6751a7c9abad8ef76b531f9c0dc38cb0c12689
2021-05-08 11:27:44 +02:00
Xin Li
d63133de19 Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." 2021-05-08 01:28:19 +00:00
Xin Li
170ddc54a7 DO NOT MERGE - Mark RQ2A.210105.001 as merged.
Bug: 180401296
Merged-In: I9287610ee2ccfec165b0a0bc2e3b24e0eb84ca31
Change-Id: I22813c0292bbf0ed2dcb09d17950c7615884bbaf
2021-05-07 14:32:24 -07:00
Julien Desprez
fd06c732e1 Attempt to run python-stack_core_test
Test: presubmit
Bug: 185900237
Change-Id: I7c41545d4e1fbdeebd729615b5b12ee64ba6a8b9
2021-05-06 09:17:45 -07:00
Pirama Arumuga Nainar
4851047a4c Merge "Send coverage flush signal to only processes that handle signal 37." 2021-05-04 03:54:46 +00:00
Pirama Arumuga Nainar
beb6fb7493 Send coverage flush signal to only processes that handle signal 37.
Bug: http://b/160401633

Also:
- fix regexp to find clang prebuilt version to allow a suffix.
- call `adb root` before any operation.

Test: acov-llvm.py flush
Change-Id: I9287610ee2ccfec165b0a0bc2e3b24e0eb84ca31
2021-04-30 15:06:39 -07:00
Yuntao Xu
056344fcf6 Merge "Revert "Convert Development/Android.mk to Android.bp"" 2021-04-30 20:01:33 +00:00
Yuntao Xu
bdf46bdb5d Revert "Convert Development/Android.mk to Android.bp"
This reverts commit 5ec6ecafd8.

Reason for revert: <cause build breakage>

Change-Id: Ib761f8675b3f09a53f33b786101022de287ac4ea
2021-04-30 18:41:41 +00:00
Yuntao Xu
d0e60e25c2 Merge "Convert Development/Android.mk to Android.bp" 2021-04-30 17:15:35 +00:00
Yuntao Xu
e79f478e3c Merge "Convert monkey/Android.mk to Android.bp" 2021-04-30 17:15:06 +00:00
Yuntao Xu
9e504cc4c5 Merge "Convert MultiDisplay/Android.mk to Android.bp" 2021-04-30 17:04:08 +00:00
Yuntao Xu
64b8511941 Merge "Convert Android.mk to Android.bp" 2021-04-30 17:03:49 +00:00
Yuntao Xu
e281d79cff Merge "Convert IntentPlayground/Android.mk to Android.bp" 2021-04-30 16:58:56 +00:00
Yuntao Xu
16d4d75ae6 Merge "Convert ShortcutSample/Android.mk to Android.bp" 2021-04-30 16:55:29 +00:00
Yuntao Xu
414db426ae Convert IntentPlayground/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186778349
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I92d9b412fb3c0ae85dd1a76497cb6cdb359eaae3
2021-04-29 23:41:40 -07:00
Yuntao Xu
3f434c4083 Convert ShortcutSample/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186778349
Test: compared the results built by Make and Soong
Test: TreeHugger
Change-Id: I8613fbebc139dcf0f398f048e5716f126e987707
2021-04-29 22:47:32 -07: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
ec44e57e10 Merge "Make the stack script python3.5 compatible." 2021-04-29 16:48:07 +00:00
Yo Chiang
6a454c160e Merge "repo-review: Add a 'restore' command line option" 2021-04-29 05:11:23 +00:00
Yuntao Xu
f657275aa4 Convert monkey/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186677673
Test: compared the results built by Make and Soong
Test: TreeHugger
Change-Id: Ib850e78443e11ef4834e6567cd447e88627512d3
2021-04-28 17:16:23 -07:00
Yuntao Xu
5ec6ecafd8 Convert Development/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186677673
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I5f9580d82b392d3913bed2c4a888928292aea7ac
2021-04-28 16:30:20 -07:00
Yuntao Xu
10ed0f4b9c Convert MultiDisplay/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186677673
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I8cbfa4980e3757af5a27a35c255f301b9b5b5be4
2021-04-28 15:51:52 -07:00
Yuntao Xu
8d78ee5666 Convert Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186677673
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I4b92172ce1370aebd28c11aaeee8c75f5529a570
2021-04-28 14:58:02 -07: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
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
e748063d28 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" 2021-04-21 18:21:22 +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
4e005d8a1c Merge "Revert "Remove DX from the SDK"" 2021-04-19 14:29:33 +00:00