Commit Graph

30021 Commits

Author SHA1 Message Date
Ivan Lozano
7ad0dcdb53 Merge "Add rlib support for vendor_snapshot/update.py" am: 414406092b
Original change: https://android-review.googlesource.com/c/platform/development/+/1725631

Change-Id: Ia9b66f1602d8d085188b7c7a3eb4affa75e3acad
2021-06-04 14:04:34 +00:00
Ivan Lozano
414406092b Merge "Add rlib support for vendor_snapshot/update.py" 2021-06-04 13:48:11 +00:00
Pirama Arumuga Nainar
755c2a3bff [update_clang-tools.sh] Ignore failures when removing .fetch*
Sometimes these files are absent but this causes the script to fail since
it's run with `-e`.  Ignore failures when deleting .fetch*.

Test: run script
Change-Id: Ida750b504064f2da53d0d9444838a49e476530d4
2021-06-04 05:15:31 +00:00
Joel Galenson
f6b3c91d21 Allow blocklisting tests.
This allows you to give cargo2android.py a list of test files to ignore.

Test: Use on a couple crates.
Change-Id: Id9422c496de6693029754f32d9805f1cb92d33cb
2021-06-03 16:00:54 -07:00
Joel Galenson
5739097d78 Merge "Allow blocklisting dependencies." am: 48a7eed92d
Original change: https://android-review.googlesource.com/c/platform/development/+/1726172

Change-Id: I63c9e81c4a11599d7cc3f52b287e8786e6e7fee8
2021-06-03 20:25:14 +00:00
Joel Galenson
48a7eed92d Merge "Allow blocklisting dependencies." 2021-06-03 20:07:33 +00:00
Ivan Lozano
40c498011f Add rlib support for vendor_snapshot/update.py
Adds support for collecting rlibs as part of the vendor snapshot.

Bug: 184042776
Test: m dist vendor-snapshot
Test: python3 development/vendor_snapshot/update.py --local $DIST_DIR --install-dir
    vendor/vendor_name/vendor_snapshot VER
Test: vendor_snapshot_rlib modules generated, vendor_snapshot has rlibs
Change-Id: Ia90e53131c4ffba32883718b66ba99f4962d4633
2021-06-03 10:52:33 -04:00
Joel Galenson
97e414af12 Allow blocklisting dependencies.
A few crates have patches that manually remove a dependency that
cargo2android.py adds.  This option can allow us to remove those
patches.

Test: Use when running on a few crates.
Change-Id: Ie8337789ab232fb726ccfe361df489acfdd31b20
2021-06-02 15:49:04 -07:00
Joel Galenson
9acf2ae10a Merge changes from topic "updater-c2a-fixes" am: 30e705aefe
Original change: https://android-review.googlesource.com/c/platform/development/+/1714960

Change-Id: If34bf52b82436c315dc8025dbfa6fbcffb605489
2021-06-02 21:16:35 +00:00
Joel Galenson
30e705aefe Merge changes from topic "updater-c2a-fixes"
* changes:
  Abort cargo2android.py if the patch fails.
  Raise an exception if we encountered an error.
2021-06-02 20:51:38 +00:00
Yuntao Xu
68c0d71fb3 Merge "Convert UiAutomator/Android.mk to Android.bp" am: 34c918d55b
Original change: https://android-review.googlesource.com/c/platform/development/+/1715514

Change-Id: I4a55a1ac94786310df8805229eed9b4eea74b119
2021-05-26 00:29:10 +00:00
Yuntao Xu
34c918d55b Merge "Convert UiAutomator/Android.mk to Android.bp" 2021-05-26 00:10:23 +00:00
Colin Cross
ef25b2c247 Merge "Update lint baseline for AutofillKeyboard" am: eb979b9145
Original change: https://android-review.googlesource.com/c/platform/development/+/1715995

Change-Id: I2382f174d0548e9d00fdd6d2dec1cab6b3a1b612
2021-05-25 17:08:57 +00:00
Colin Cross
eb979b9145 Merge "Update lint baseline for AutofillKeyboard" 2021-05-25 16:40:51 +00:00
Colin Cross
86786ee8ae Update lint baseline for AutofillKeyboard
An androidx update triggered some NewApi errors.

Bug: 189179560
Test: m out/soong/.intermediates/development/samples/AutofillKeyboard/AutofillKeyboard/android_common/lint/lint-report.html
Change-Id: I219130d6f8ee791566ddeb4542a52225f124500d
2021-05-25 08:11:26 -07:00
Treehugger Robot
3baff8541d Merge "Select apex variants from lsdump paths" am: f85188cf82
Original change: https://android-review.googlesource.com/c/platform/development/+/1716589

Change-Id: Id658e185b8e94b3f1f208482d1f05bbcdc06f4a8
2021-05-25 06:49:20 +00:00
Treehugger Robot
f85188cf82 Merge "Select apex variants from lsdump paths" 2021-05-25 06:30:40 +00:00
Hsin-Yi Chen
ebea84643a Select apex variants from lsdump paths
Bug: 188870336
Test: ./create_reference_dumps.py
Change-Id: I15a1f6a7c5c4952d2deb403aa9e9d58a0733561b
2021-05-25 12:56:23 +08:00
Treehugger Robot
c96e4100c5 Merge "First commit for otagui project." am: 7f7af47357
Original change: https://android-review.googlesource.com/c/platform/development/+/1716770

Change-Id: Ib48973b32bd83f0193b85bd1d1782e50d702be31
2021-05-25 02:43:32 +00:00
Treehugger Robot
7f7af47357 Merge "First commit for otagui project." 2021-05-25 02:24:30 +00:00
lishutong
9295b995ea First commit for otagui project.
Test: no test is required.
Change-Id: I29bbe71df3087b006540903b7b86d124da07d913
2021-05-24 23:05:16 +00:00
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
bbddce09cb Merge "Print the coverage report location at the end of acov-llvm.py report." am: 1f1a79d97d
Original change: https://android-review.googlesource.com/c/platform/development/+/1714165

Change-Id: Ie3208324b20ffed1af7c682eaf80c73886276734
2021-05-21 19:45:11 +00: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
ade8ccd5b0 Merge "Attempt to run python-stack_core_test" am: 59189ecc35
Original change: https://android-review.googlesource.com/c/platform/development/+/1682228

Change-Id: Ib407864f63d47e7bd1ce5b55bcf3c36e8eda8598
2021-05-21 01:21:11 +00:00
Julien Desprez
59189ecc35 Merge "Attempt to run python-stack_core_test" 2021-05-21 01:04:24 +00:00
Yuntao Xu
d690d16db5 Convert UiAutomator/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 188694412
Test: compared the two jar files built by Make and Soong
Test: TreeHugger
Change-Id: I84b6e1311d0e35d4bce1c86d9c6eff1ce051c7f8
2021-05-20 17:41:05 -07:00
Treehugger Robot
effcc121ba Merge "When cargo errors, print an error about cargo.out." am: 0b1aa4958f
Original change: https://android-review.googlesource.com/c/platform/development/+/1709400

Change-Id: I601e467415d4212642a634544b75efca53bbbefd
2021-05-18 04:51:25 +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
Yuntao Xu
49de3c50b5 Convert Android.mk to Android.bp
1. Convert ApiDemos/Android.mk to ApiDemos/Android.bp;
2. Convert ApiDemos/tests/Android.mk to ApiDemos/tests/Android.bp

Bug: 186778349
Test: compared the apk files built by Make and Soong
Test: TreeHugger
Change-Id: I7b72a998b56804e647d0908be5a118f9bf2cd896
Merged-In: I7b72a998b56804e647d0908be5a118f9bf2cd896
2021-05-14 12:30:19 -07:00
Roland Levillain
a0c4af18c3 Merge "Fix adb root invocations in script acov-llvm.py." am: 97988980d0
Original change: https://android-review.googlesource.com/c/platform/development/+/1706846

Change-Id: I980c026ce0d0b0ee5133ff32b61e0b3e72eeba7f
2021-05-14 17:19:06 +00:00
Roland Levillain
97988980d0 Merge "Fix adb root invocations in script acov-llvm.py." 2021-05-14 16:35:08 +00:00
Treehugger Robot
9b98a3668c Merge "Add support for vndk llndk libraries in Android.bp" am: f205499be8
Original change: https://android-review.googlesource.com/c/platform/development/+/1706410

Change-Id: Ia3c4388f6e2c26885197611b737fa5fdb4946ae5
2021-05-14 08:42:31 +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
4cece5365b Merge "Add <uses-library> information." am: 37f061b11a
Original change: https://android-review.googlesource.com/c/platform/development/+/1701947

Change-Id: Iac3d56f6844ce04e5e7d3bf7058e5073eab18e67
2021-05-11 16:51:13 +00: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
914371f674 Merge "monkey: Use java_binary" am: 4b4bf9f755
Original change: https://android-review.googlesource.com/c/platform/development/+/1699169

Change-Id: I6c89aa3fde6ae33f9005ba8a96c2c0945c9720bb
2021-05-09 01:59:56 +00: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
a5a45097ac [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: d63133de19 -s ours
am skip reason: Merged-In I9287610ee2ccfec165b0a0bc2e3b24e0eb84ca31 with SHA-1 beb6fb7493 is already in history

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

Change-Id: I062c0ffda214333e3d4f22dafb7e6a85a66b0200
2021-05-08 01:48:53 +00: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
67447582a3 Merge "Send coverage flush signal to only processes that handle signal 37." am: 4851047a4c
Original change: https://android-review.googlesource.com/c/platform/development/+/1691921

Change-Id: I07ff7d6a4d983052c4cddaa6974d5a24f268cdaa
2021-05-04 04:13:26 +00:00