Treehugger Robot
8ff398a773
Merge changes Ib62b19c1,I80a6ecd8,I37b9aa96,I4de409b3 am: 126ca5f962
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2194760
Change-Id: Id8523130b3794c2f8e1e62c18c8ca551bbbe6f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 18:45:02 +00:00
Treehugger Robot
126ca5f962
Merge changes Ib62b19c1,I80a6ecd8,I37b9aa96,I4de409b3
...
* changes:
c2a: Clean-up no-ops with 'pass'
c2a: Crate: Don't parse -Wclippy, -D, and -W flags
c2a: Crate: Parse unquoted rustc args
c2a: Extend unquote() to single quotes
2022-08-25 18:22:08 +00:00
Pierre-Clément Tosi
fd12b5feed
c2a: Clean-up no-ops with 'pass'
...
Bug: 243662244
Test: -
Change-Id: Ib62b19c18da7e3a44c74303a72a9c27f9d8b3315
2022-08-24 17:41:08 +01:00
Pierre-Clément Tosi
e5342d134a
c2a: Crate: Don't parse -Wclippy, -D, and -W flags
...
Don't fail the generation of the Android.bp file when those flags are
encountered.
Bug: 243662244
Test: Used on gdbstub, which fixed issues seen in aosp/2191020
Change-Id: I80a6ecd8df7980234552a98ddb1149dc29542ac7
2022-08-24 17:41:08 +01:00
Pierre-Clément Tosi
435dfe58d1
c2a: Crate: Parse unquoted rustc args
...
Prevent the script from missing flags (minus-prefixed arguments) due to
the CLI argument being quoted (making the "-" its second character).
This removes the need to manually unquote the args in the few cases
where the code already handles them being in quotes.
Bug: 243662244
Test: -
Change-Id: I37b9aa96dcbbeb04616bddfca657d066b998d7c7
2022-08-24 17:40:23 +01:00
Pierre-Clément Tosi
dde806f72d
c2a: Extend unquote() to single quotes
...
Bug: 243662244
Test: -
Change-Id: I4de409b3135369425f8fa934f490e701505cd55d
2022-08-24 16:36:34 +01:00
Inseob Kim
f6f0697324
Merge "Fix build_vendor script bug" am: 2056001c65
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2192193
Change-Id: I7bb23dee813a969797bf045fc60e7cdfa25bde02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 01:40:58 +00:00
Inseob Kim
2056001c65
Merge "Fix build_vendor script bug"
2022-08-23 01:11:34 +00:00
Inseob Kim
9c1140b920
Fix build_vendor script bug
...
Test: manual
Change-Id: I345151ed956a94f681388ab167c912304618130a
2022-08-23 10:05:18 +09:00
Cole Faust
201f62aa05
Merge "Fix array-related errorprone warnings" am: 159371eef5
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2184500
Change-Id: Iee056a1b6eee9732d5b7b03b78c6278ce84afc89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 23:14:08 +00:00
Cole Faust
159371eef5
Merge "Fix array-related errorprone warnings"
2022-08-22 22:51:09 +00:00
Mu-Le Lee
cf474e4d59
Merge "Fix header-abi-diff skips diff when config.json is not found" am: 3bf758113b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2190085
Change-Id: I737afb42d20ea81a5b104fb1aae2a49623dc88f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:30:59 +00:00
Mu-Le Lee
3bf758113b
Merge "Fix header-abi-diff skips diff when config.json is not found"
2022-08-22 15:09:09 +00:00
Mu-Le Lee
82c4dd2bc7
Fix header-abi-diff skips diff when config.json is not found
...
Skip loading config.json when the config.json is not found so the
header-abi-diff will still perform abi diff.
Test: preform abi diff without config.json
Bug: 243328443
Change-Id: I92ebf7e7bfe6abb57bdefa211eaf604efaee517e
2022-08-22 08:32:57 +00:00
Inseob Kim
bfbe1c167d
Merge "Analyze project usages with manifest" am: 61b8730ec6
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2190086
Change-Id: I936da4c46115c0f436eb6726383886e31b6d3d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 07:36:31 +00:00
Inseob Kim
61b8730ec6
Merge "Analyze project usages with manifest"
2022-08-22 07:11:11 +00:00
Inseob Kim
4c8cf32e1e
Analyze project usages with manifest
...
Bug: 242961282
Test: manual
Change-Id: Ie5511541c3b2c60f3d56888b75e2e2ba2212123d
2022-08-22 06:15:52 +00:00
Inseob Kim
0242c83aed
Merge "Make build_vendor script configurable" am: b09c616b48
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2190438
Change-Id: Iba9d396c73dc44f6ce342797fe3f3f72ba5412d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 13:27:12 +00:00
Inseob Kim
b09c616b48
Merge "Make build_vendor script configurable"
2022-08-19 13:00:54 +00:00
Inseob Kim
68c004fbc7
Make build_vendor script configurable
...
To support Pixel targets as well.
Bug: 242961282
Test: manual
Change-Id: Ieab708c42fec9ae488c47e8302fb01d6175c0550
2022-08-19 19:55:41 +09:00
Mu-Le Lee
83faed3220
Merge "Implement the Cross-Version ABI diff configuration" am: 7b72a4f5f1
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2182596
Change-Id: I037c48d8db6c80e343aae6b598c8c986820abb44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 08:47:19 +00:00
Mu-Le Lee
7b72a4f5f1
Merge "Implement the Cross-Version ABI diff configuration"
2022-08-19 08:25:45 +00:00
Mu-Le Lee
2ce72d8673
Implement the Cross-Version ABI diff configuration
...
Enable the Cross-Version ABI diff configuration so developers can
specify different flags for current and previous version ABI Check. The
-target-version flag were added to determine the config section to be
selected. The details of this configuration logic could be found in
go/cross-version-abi-diff-configuration.
Test: preform abi diff with config.json
Bug: 239792343
Change-Id: I8fdad2d18096cfa7866183ecc2d7826682c85eb6
2022-08-19 04:42:03 +00:00
Treehugger Robot
09a4fbcac7
Merge "cargo2android: fix test detection when there is exactly 1 test" am: 9bd80cb611
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2188723
Change-Id: I33dba89495f1df09409a9ac5187faed30c22fba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-18 20:47:00 +00:00
Treehugger Robot
9bd80cb611
Merge "cargo2android: fix test detection when there is exactly 1 test"
2022-08-18 20:19:25 +00:00
Frederick Mayle
9f0dd71b8a
cargo2android: fix test detection when there is exactly 1 test
...
Example where it failed:
tests::sock_send_recv_event: test
1 test, 0 benchmarks
Doc-tests vm_control
0 tests, 0 benchmarks
the "1 test, 0 benchmarks" line wouldn't match the test regex, so it
would mistakenly parse the doc tests line instead and then fail to
generate a rust_test module.
Test: ran on crosvm repo
Change-Id: Id0286165405b58bf84b7261db842e272442c91e8
2022-08-17 20:36:45 +00:00
Matthew Maurer
ad73674f9d
Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2129337
Change-Id: Ifa740eda5483de4b4a660fa52a8ab3b277b3c9e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 16:27:48 +00:00
Matthew Maurer
b1d8a2de5f
Merge changes I4c3744e0,I91d8de92
...
* changes:
c2a: Our cargo works again, re-enable defaulting.
c2a: Fix rust_version calculation
2022-08-17 16:08:32 +00:00
Mu-Le Lee
1997b594d6
Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545
Change-Id: I41ea447c0c56dbd4ec8123c579fa103f39964dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 06:21:43 +00:00
Mu-Le Lee
e43c2bc9a7
Merge "Change the format of header-abi-diff config from .ini to .json"
2022-08-17 05:58:15 +00:00
Automerger Merge Worker
cf3ad91aae
Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master
...
* changes:
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours
[automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours
2022-08-16 23:43:03 +00:00
Xin Li
4392c82f8e
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours
...
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history
Original change: https://android-review.googlesource.com/c/platform/development/+/2186582
Change-Id: I131c41a522f76f5e882740a2a2919f0cdc844c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:40:15 +00:00
Xin Li
b6f1bde694
[automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours
...
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history
Original change: https://android-review.googlesource.com/c/platform/development/+/2186582
Change-Id: I620e778713628d311f5afc77748b638a9daffe4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:39:45 +00:00
Xin Li
7f7c44d6ca
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours
...
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history
Original change: https://android-review.googlesource.com/c/platform/development/+/2186582
Change-Id: Iae99cc2ad02a8eaf997200f93de1f4525afa2d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:37:51 +00:00
Xin Li
f2ea94b3a9
[automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours
...
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history
Original change: https://android-review.googlesource.com/c/platform/development/+/2186582
Change-Id: I2725c3ee80866631a44553f9859e484509d34033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:37:20 +00:00
Xin Li
4ce806fe1b
Merge "DO NOT MERGE - Merge Android 13"
2022-08-16 19:08:16 +00:00
Treehugger Robot
39d748b0ae
Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580
Change-Id: I4fc8a98e2ca40e081cbdd77e43631ce5ea7fe9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 05:04:00 +00:00
Xin Li
aa167d631e
DO NOT MERGE - Merge Android 13
...
Bug: 242648940
Merged-In: Ib270c83d4f18dc7e301667733df8952f83581116
Change-Id: I196fa21c8487e0f57ab3d8a4761e149fe407f083
2022-08-15 21:59:27 -07:00
Treehugger Robot
ddbf515da8
Merge "Bumping package version number for T. Test: treehugger Bug: 242625850"
2022-08-16 04:36:55 +00:00
Shaju Mathew
6e77cfb32b
Bumping package version number for T.
...
Test: treehugger
Bug: 242625850
Signed-off-by: Shaju Mathew <shaju@google.com >
Change-Id: I5f52e907afdbfed6943f97e11c612e1efbd244d1
2022-08-16 02:57:18 +00:00
Cole Faust
1bb113c2fc
Fix array-related errorprone warnings
...
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.
Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Iaecb05992482dfea041e51e3978d0d51d4ca2ce8
2022-08-15 18:24:25 -07:00
Inseob Kim
34f24fd47e
Merge "Export vendor.img and ninja analysis results" am: de0317677b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577
Change-Id: I4434820f626afe78b56a15d678d16d7bc1c5486f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 05:03:53 +00:00
Inseob Kim
de0317677b
Merge "Export vendor.img and ninja analysis results"
2022-08-12 04:35:18 +00:00
Inseob Kim
28092bd22e
Export vendor.img and ninja analysis results
...
Test: manual
Change-Id: Ib270c83d4f18dc7e301667733df8952f83581116
2022-08-12 10:56:51 +09:00
Matthew Maurer
5584fd7393
Merge "rust: addr3prf: Support COPYING files" am: a2fff95476
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815
Change-Id: I45d9882d7382e13ec7d6838b7b878aed3efa2945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 17:06:42 +00:00
Matthew Maurer
a2fff95476
Merge "rust: addr3prf: Support COPYING files"
2022-08-11 16:52:28 +00:00
Mu-Le Lee
c2ebbbfec5
Change the format of header-abi-diff config from .ini to .json
...
Since Cross-Version ABI Check is introduced, the flags could be
different when diffing with previous or current dumps. The structure and
format of the newly proposed config are changed so users can configure
flags for different diff targets. This CL changes the config format from
.ini to .json with the same features the format of the json is described
in go/cross-version-abi-diff-configuration.
Test: preform abi diff with config.json
Bug: 239792343
Change-Id: I731bafbfdacd2a780c5f7a27997893cecb2eb1f3
2022-08-11 06:35:33 +00:00
Matthew Maurer
51ec016f76
rust: addr3prf: Support COPYING files
...
Previously, we only looked for LICENSE* files. This adds support for
detecting COPYING* files as an alternate representation of the license.
Bug: 234563254
Test: get_rust_pkg.py -add3prf quiche
Change-Id: Ic04ef42f349879be18a4307bd863288dfa81b5fc
2022-08-10 15:29:24 -07:00
Inseob Kim
99b62ffe4e
Merge "Add multitree sample build script" am: ea3c580c00
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374
Change-Id: Id12670ebc9c220d5cb78e9b33fd348fe5e618982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 06:34:40 +00:00
Inseob Kim
ea3c580c00
Merge "Add multitree sample build script"
2022-08-10 06:14:39 +00:00