Commit Graph

29810 Commits

Author SHA1 Message Date
Neha Jain
ed2551e374 Updating build-tools package revision number to ship a hot fix for b/169193089 am: 81daa26558 am: 76b00edfa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12968794

Change-Id: I2c6ef3458b7f18fb301f6612ebf6c5a5603e90c2
2020-11-02 23:03:29 +00:00
Neha Jain
e6356b75e5 Updating build-tools package revision number to ship a hot fix for b/169193089 am: 81daa26558 am: 76b00edfa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12968794

Change-Id: I38936a4d9328419dd14543c2ce698933f734149b
2020-11-02 23:03:09 +00:00
Chih-hung Hsieh
75c2b4d05e Merge "Do not use Cargo.lock during cargo build." am: 73c7e65403
Original change: https://android-review.googlesource.com/c/platform/development/+/1480746

Change-Id: Iec641377c5a443bb9bd3effac073e4861e27e418
2020-11-02 22:48:40 +00:00
Neha Jain
76b00edfa0 Updating build-tools package revision number to ship a hot fix for b/169193089 am: 81daa26558
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12968794

Change-Id: I9b7e1e7f7046a5e6e8aff101c21f6e89fe7a06ee
2020-11-02 22:47:59 +00:00
Chih-Hung Hsieh
ec8846be07 Add --patch and --ignore-cargo-errors options
* The given patch file will be applied to ./Android.bp.
* Use --ignore-cargo-errors when it is impossible to
  use the patch file to fix the error messages in Android.bp.

Bug: 172093078
Test: apply on external/rust/crates/*, some with this flag
Change-Id: Ibca2fd4c63e46a32f32c61afedbba960a684f5d7
2020-11-02 21:55:39 +00:00
Chih-hung Hsieh
73c7e65403 Merge "Do not use Cargo.lock during cargo build." 2020-11-02 21:50:27 +00:00
Chih-Hung Hsieh
610a894a49 Do not use Cargo.lock during cargo build.
* Save Cargo.lock before calling cargo, and restore it after the run.
* Use the --use-cargo-lock flag if the latest dependent crates failed
  to build the current crate. In this case, the published Cargo.lock
  will be used, but the generated .bp might not work with the other
  latest dependent crates in external/rust/crates.
* Fix one gpylint warning.

Bug: 172016745
Test: run through all external/rust/crates/*
Change-Id: I1874a706ac15b74c1dd5a606983b107284d9b28a
2020-11-02 21:49:31 +00:00
Neha Jain
81daa26558 Updating build-tools package revision number to ship a hot fix for b/169193089
Bug: 169193089
Change-Id: I025c0d96e77b7355baddac935779c6b27f3042e3
Test: N/A
2020-11-02 19:58:24 +00:00
Chih-hung Hsieh
454ad22274 Merge "Add a --copy-out flag for build.rs output files." am: 9dadd5899d am: 043d88799d am: e64b6aaecc
Original change: https://android-review.googlesource.com/c/platform/development/+/1473496

Change-Id: Ica3d42409cc9fe0440c32944ca17a9ab43d04140
2020-10-26 21:49:58 +00:00
Chih-hung Hsieh
e64b6aaecc Merge "Add a --copy-out flag for build.rs output files." am: 9dadd5899d am: 043d88799d
Original change: https://android-review.googlesource.com/c/platform/development/+/1473496

Change-Id: I1cc45c0792e5bf2c854d9e8d5c6ee86029c48de5
2020-10-26 21:16:22 +00:00
Chih-hung Hsieh
043d88799d Merge "Add a --copy-out flag for build.rs output files." am: 9dadd5899d
Original change: https://android-review.googlesource.com/c/platform/development/+/1473496

Change-Id: Idb55e44047210a87591d446a2e19c705e450b54f
2020-10-26 20:47:36 +00:00
Chih-hung Hsieh
9dadd5899d Merge "Add a --copy-out flag for build.rs output files." 2020-10-26 20:35:02 +00:00
Chih-Hung Hsieh
e2342bac4b Add a --copy-out flag for build.rs output files.
* When --copy-out is used:
  * copy build.rs output files to ./out
  * add a genrule module to copy ./out/* files to its output dir
  * add this copy-out genrule module into the srcs list
  This makes include! with $OUT_DIR path work without local patch.
  This only works for the root directory (package).
* Upgrade to python3 for some required shutil and glob functions.
* Unified dump_srcs_list for defaults and non-defaults modules.
* dump_android_property_list output only one line for a single item list.

Bug: 171659849
Test: regenerate all .bp files in rust/crates/*
Change-Id: Ia7dde0ccede2bcc068f23a046e85304c6f50b0b0
2020-10-25 18:06:04 -07:00
Julien Desprez
8d2f1078e8 Merge "Delete hosttestlib as it's a legacy approach" am: 2f18dab43e am: 3ec8c61452 am: 4f5b4d7d57
Original change: https://android-review.googlesource.com/c/platform/development/+/1359842

Change-Id: Id2404058c1db4a8db6a3be2a19b92bb94b425d0a
2020-10-23 04:11:31 +00:00
Julien Desprez
4f5b4d7d57 Merge "Delete hosttestlib as it's a legacy approach" am: 2f18dab43e am: 3ec8c61452
Original change: https://android-review.googlesource.com/c/platform/development/+/1359842

Change-Id: I6685531778fa4614efe35e29622f59b0e76c2517
2020-10-23 03:44:41 +00:00
Julien Desprez
3ec8c61452 Merge "Delete hosttestlib as it's a legacy approach" am: 2f18dab43e
Original change: https://android-review.googlesource.com/c/platform/development/+/1359842

Change-Id: I0479c79a4bf828d4eb5e7acedf10c2d1e8aee212
2020-10-22 23:15:42 +00:00
Julien Desprez
2f18dab43e Merge "Delete hosttestlib as it's a legacy approach" 2020-10-22 23:00:08 +00:00
Bill Peckham
468b01a123 Merge "Include 'name' in props; use post-sanitize module name." am: 7f81f5473b am: 5c54fd6dab am: 6df5847c53
Original change: https://android-review.googlesource.com/c/platform/development/+/1469871

Change-Id: I0e33d8b6ac13c479d351e73f1a5a30b102986431
2020-10-22 22:20:03 +00:00
Bill Peckham
6df5847c53 Merge "Include 'name' in props; use post-sanitize module name." am: 7f81f5473b am: 5c54fd6dab
Original change: https://android-review.googlesource.com/c/platform/development/+/1469871

Change-Id: I7ffaf69ded860658abb9509d3c33330e515a3726
2020-10-22 21:52:56 +00:00
Bill Peckham
5c54fd6dab Merge "Include 'name' in props; use post-sanitize module name." am: 7f81f5473b
Original change: https://android-review.googlesource.com/c/platform/development/+/1469871

Change-Id: I23789ff1fa3119dd7bd70bac7439409ea72fbc2f
2020-10-22 21:07:37 +00:00
Bill Peckham
7f81f5473b Merge "Include 'name' in props; use post-sanitize module name." 2020-10-22 18:08:16 +00:00
Yo Chiang
db8dc337c8 Merge "Add Android.bp prebuilt ELF check error fixer" am: f60ad911d4 am: 7d6785b6d8 am: 218b0c3135
Original change: https://android-review.googlesource.com/c/platform/development/+/1253430

Change-Id: I5a0339b7cde23e69b63c82a8ad7d57ee46036a0a
2020-10-22 12:23:14 +00:00
Yo Chiang
218b0c3135 Merge "Add Android.bp prebuilt ELF check error fixer" am: f60ad911d4 am: 7d6785b6d8
Original change: https://android-review.googlesource.com/c/platform/development/+/1253430

Change-Id: Ia3f3de0f0edca000814a7afc39e7b49b6efbf95f
2020-10-22 10:54:09 +00:00
Yo Chiang
7d6785b6d8 Merge "Add Android.bp prebuilt ELF check error fixer" am: f60ad911d4
Original change: https://android-review.googlesource.com/c/platform/development/+/1253430

Change-Id: I3d8d543a0947c5606cd4f1e4445f6a34f8248b7f
2020-10-22 09:51:35 +00:00
Yo Chiang
f60ad911d4 Merge "Add Android.bp prebuilt ELF check error fixer" 2020-10-22 07:48:08 +00:00
Bill Peckham
3bdbd34b9a Include 'name' in props; use post-sanitize module name.
In cases where not all the variants of a library are
included in the generated vendor snapshot, be sure to
include the module name in the props so that it can be
factored out later.

Conversely, be sure to compute the notice filename from
the de-sanitized module name so so that it can also be
factored out later.

Bug: 171413810
Bug: 157967325
Test: Verify that full snapshot Android.bp unchanged.
Test: Verify correct syntax for filtered snapshot.
Change-Id: I5725e17b19907d6a5063823e8b99bd0517c7c144
2020-10-21 15:49:54 -07:00
Chih-hung Hsieh
49b73c6ff7 Merge "Better heuristic to find license types" am: 7cf8a749fb am: 60c4d996bc am: 85a8720e8c
Original change: https://android-review.googlesource.com/c/platform/development/+/1465813

Change-Id: Id53e230eb43a691a21f57e91547f10c679660a2e
2020-10-21 06:32:59 +00:00
Chih-hung Hsieh
85a8720e8c Merge "Better heuristic to find license types" am: 7cf8a749fb am: 60c4d996bc
Original change: https://android-review.googlesource.com/c/platform/development/+/1465813

Change-Id: I2241b6f03b308818d2253cc1c5916af338d99442
2020-10-21 06:00:29 +00:00
Chih-hung Hsieh
60c4d996bc Merge "Better heuristic to find license types" am: 7cf8a749fb
Original change: https://android-review.googlesource.com/c/platform/development/+/1465813

Change-Id: I41d818c543a8fbc1df3b4051c892e605f4fa2825
2020-10-21 05:32:05 +00:00
Chih-hung Hsieh
7cf8a749fb Merge "Better heuristic to find license types" 2020-10-21 05:06:44 +00:00
Treehugger Robot
06ba03a5ef [automerger skipped] Merge "Merge redfin/bramble support." am: dc03000e92 -s ours am: f702deaaf2 -s ours am: eeea1b9d9c -s ours
am skip reason: Change-Id I674d1774ce50ac71a37fcc0eb418d310fe01a289 with SHA-1 5052c70dd8 is in history

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

Change-Id: I25f2d2cc09387e65280f684a459f9b61fdf2fde1
2020-10-20 20:18:30 +00:00
Treehugger Robot
eeea1b9d9c [automerger skipped] Merge "Merge redfin/bramble support." am: dc03000e92 -s ours am: f702deaaf2 -s ours
am skip reason: Change-Id I674d1774ce50ac71a37fcc0eb418d310fe01a289 with SHA-1 5052c70dd8 is in history

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

Change-Id: I9b76308dd1403e26edf06f9de6c52683ea59fee6
2020-10-20 19:34:11 +00:00
Treehugger Robot
f702deaaf2 [automerger skipped] Merge "Merge redfin/bramble support." am: dc03000e92 -s ours
am skip reason: Change-Id I674d1774ce50ac71a37fcc0eb418d310fe01a289 with SHA-1 5052c70dd8 is in history

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

Change-Id: I39c940733dabe0b3a0c322ac9365e77550ceed69
2020-10-20 19:04:14 +00:00
Chih-Hung Hsieh
03f14e4b4f Better heuristic to find license types
* Handle lower case file names like LICENSE-Apache.
* Use "license" key value in Cargo.toml if LICENSE-* files are missing.
* Recognize license type: ISC
* Improve readability of a sequence of if-statements.

Bug: 170254513
Test: get_rust_pkg.py --add3prf time-macros-impl
Test: run add3prf.py in current rust/crates/* projects
Change-Id: I9642f52090b20922302513a94fa97d41277f9762
2020-10-19 23:15:50 -07:00
Treehugger Robot
649ee4b948 Merge "Don't include stdlibc++.so in win platform-tools" am: 75db0e8a16 am: b9cc94cdbd am: aa9b75e636
Original change: https://android-review.googlesource.com/c/platform/development/+/1466461

Change-Id: Ib102cc79563c02ea0418882d7caa06918e9b87e5
2020-10-20 00:06:05 +00:00
Treehugger Robot
aa9b75e636 Merge "Don't include stdlibc++.so in win platform-tools" am: 75db0e8a16 am: b9cc94cdbd
Original change: https://android-review.googlesource.com/c/platform/development/+/1466461

Change-Id: I0a333e10899cfc47e7a4da5b44d8d23839655d51
2020-10-19 23:53:20 +00:00
Treehugger Robot
b9cc94cdbd Merge "Don't include stdlibc++.so in win platform-tools" am: 75db0e8a16
Original change: https://android-review.googlesource.com/c/platform/development/+/1466461

Change-Id: I112aa17e4c04cea4baf9fedf8db5e89a3922e537
2020-10-19 23:35:44 +00:00
Treehugger Robot
dc03000e92 Merge "Merge redfin/bramble support." 2020-10-19 23:20:10 +00:00
Treehugger Robot
75db0e8a16 Merge "Don't include stdlibc++.so in win platform-tools" 2020-10-19 22:46:35 +00:00
Joe Baker-Malone
d2ce549b1e Don't include stdlibc++.so in win platform-tools
Test: Manually verified the file is gone.
Bug: none
Change-Id: Ifddeadebac292414a64fa2498c14a1406ed28837
2020-10-19 21:32:03 +00:00
Xin Li
c283529ac9 Merge redfin/bramble support.
Bug: 171218636
Merged-In: I674d1774ce50ac71a37fcc0eb418d310fe01a289
Change-Id: I2b92b0481bcb8ba867437009e31e7d1a0d509c51
2020-10-19 10:08:13 -07:00
Yo Chiang
cfff3e58c3 Add Android.bp prebuilt ELF check error fixer
fix_android_bp_prebuilt.sh fixes Android.bp prebuilt ELF check errors.

To auto-fix a problematic Android.bp:
$ fix_android_bp_prebuilt --in-place <bp file>

Show a diff patch to stdout instead of editing in place:
$ fix_android_bp_prebuilt --diff <bp file>

Bug: 149715904
Test: run fix_android_bp_prebuilt on some Android.bp
Change-Id: Ia1749a0f7fa468290cc2f64c4bc4f61ec4e7742b
2020-10-15 16:52:10 +08:00
Chih-hung Hsieh
7306633e21 Merge "Add add3prf.py and call it from get_rust_pky.py" am: bb90c3ad26 am: 5052c70dd8 am: b19e3646d3
Original change: https://android-review.googlesource.com/c/platform/development/+/1451282

Change-Id: Ib15f414ba37318ed5d059b86aafe2dc63cde2341
2020-10-14 21:12:01 +00:00
Chih-hung Hsieh
b19e3646d3 Merge "Add add3prf.py and call it from get_rust_pky.py" am: bb90c3ad26 am: 5052c70dd8
Original change: https://android-review.googlesource.com/c/platform/development/+/1451282

Change-Id: I3a610eb57ad4dfa80291a8cc1e33a7e339f5834a
2020-10-14 20:17:43 +00:00
Chih-hung Hsieh
5052c70dd8 Merge "Add add3prf.py and call it from get_rust_pky.py" am: bb90c3ad26
Original change: https://android-review.googlesource.com/c/platform/development/+/1451282

Change-Id: I674d1774ce50ac71a37fcc0eb418d310fe01a289
2020-10-14 20:02:07 +00:00
Chih-hung Hsieh
bb90c3ad26 Merge "Add add3prf.py and call it from get_rust_pky.py" 2020-10-14 19:40:47 +00:00
Chih-Hung Hsieh
3d24aed831 Add add3prf.py and call it from get_rust_pky.py
* add3prf.py can be called in existing rust package directories
  to normalize METADATA, OWNERS, and other LICENSE* files.
* Add option in get_rust_pkg.py to call add3prt.py and add
  required files for 3rd party reviews.

Bug: 170254513
Test: call add3prf.py in external/rust/crates/*
Test: get_rust_pkg.py --add3prf quote remain paste
Change-Id: I70ed5942847716af2ca740a91e7ecde50543b7a0
2020-10-13 22:29:07 -07:00
Xin Li
51ae92fb70 [automerger skipped] Merge ab/6749736 in stage. am: fb486680d5 -s ours am: de2870e92c -s ours
am skip reason: Change-Id Ib2b2aad76699226b54a0ea9b98dacdea1527363d with SHA-1 0c0e7dcfcb is in history

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

Change-Id: I1cbfe8a34b0a69d7bbc7241d7d05e76a93534e1d
2020-10-13 04:22:45 +00:00
Xin Li
de2870e92c [automerger skipped] Merge ab/6749736 in stage. am: fb486680d5 -s ours
am skip reason: Change-Id Ib2b2aad76699226b54a0ea9b98dacdea1527363d with SHA-1 0c0e7dcfcb is in history

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

Change-Id: Ib05b6d23d7c85d0b0c9bd5443ae7340694d20342
2020-10-13 03:51:06 +00:00
Xin Li
fb486680d5 Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Ib2b2aad76699226b54a0ea9b98dacdea1527363d
Change-Id: I8d3e3c35a7c8d268b916c01eb5f2e065cbb5bf24
2020-10-08 22:57:45 -07:00