Commit Graph

33100 Commits

Author SHA1 Message Date
Mu-Le Lee
2db1c829d5 Merge "Add option to ignore some specific LinkerSetKeys in header-abi-diff" am: a008152637
Original change: https://android-review.googlesource.com/c/platform/development/+/2198080

Change-Id: I0a76f2b71524a4752ecc41a55b990604861f2c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:21:38 +00:00
Mu-Le Lee
a008152637 Merge "Add option to ignore some specific LinkerSetKeys in header-abi-diff" 2022-09-05 07:37:06 +00:00
Treehugger Robot
8975672d19 Merge "Build dist to get build metrics" am: 9382092804
Original change: https://android-review.googlesource.com/c/platform/development/+/2206555

Change-Id: Ibb8a51856d9f8bd50e86d1161a95758940a7bbc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:56:49 +00:00
Treehugger Robot
9382092804 Merge "Build dist to get build metrics" 2022-09-05 04:24:12 +00:00
Justin Yun
367944f1c5 Build dist to get build metrics
Include dist target to build the build metrics for the vendor inner
tree build.

Bug: 241033491
Test: development/multitree/build_vendor.sh -d vsoc_x86_64 \
      -p cf_x86_64_phone -r out/dist -i %bid%
Change-Id: I7230fe2ee70eefad5e71cec7d5dc710f74f8c503
2022-09-05 12:10:25 +09:00
Treehugger Robot
b86f65e55c Merge "Fix module-file name collisions" am: 8e3e3530e8
Original change: https://android-review.googlesource.com/c/platform/development/+/2203455

Change-Id: Ic02d9e5b3dfa6f5c75296c95d31c488cf3100ff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 00:05:15 +00:00
Treehugger Robot
8e3e3530e8 Merge "Fix module-file name collisions" 2022-09-01 23:36:01 +00:00
Cole Faust
7bc42679aa Fix module-file name collisions
Bazel doesn't allow a module and file with the same name.

Bug: 198619163
Test: Presubmits
Change-Id: I8f143ad512f0d6372e3c75d363ee73f339849a3e
2022-09-01 15:13:34 -07:00
Mu-Le Lee
d93d4de71f Add option to ignore some specific LinkerSetKeys in header-abi-diff
Sometimes developers may want to ignore some incompatible changes in ABI
because it is safe for some reason. An option should be added to
header-abi-diff so it ignores these LinkerSetKeys passed from cli or
config file.

Test: perform abi diff on libz with abi-dump version 33 with the LinkerSetKey _ZTI14internal_stat is specified.
Bug: 243903630
Change-Id: Iccc79d648ae17634a987faac32a2a7cbaa784e5c
2022-09-01 08:08:13 +00:00
Treehugger Robot
af0c22dac1 Merge "Skip vndk variants check for vendor builds" am: 17a42834d3
Original change: https://android-review.googlesource.com/c/platform/development/+/2199757

Change-Id: I40cd75dd1d9befba7313f655e4f4b1173f43ea72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 05:42:25 +00:00
Treehugger Robot
17a42834d3 Merge "Skip vndk variants check for vendor builds" 2022-08-31 05:14:38 +00:00
Inseob Kim
05bf9bef07 Skip vndk variants check for vendor builds
Bug: 238270531
Test: manual
Change-Id: Ia30b7203a76ca2f19b5dff9ca0ea003a0c43414d
2022-08-31 11:59:20 +09:00
Treehugger Robot
9345b7f32e Merge "Generate ninja_inputs.pb as build metrics" am: 23862f4296
Original change: https://android-review.googlesource.com/c/platform/development/+/2200276

Change-Id: I203d631900c49827fcd45174e7aa14cb800d76bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 01:48:08 +00:00
Treehugger Robot
23862f4296 Merge "Generate ninja_inputs.pb as build metrics" 2022-08-30 01:24:48 +00:00
Justin Yun
f020989c94 Generate ninja_inputs.pb as build metrics
To monitor ninja inputs, generate ninja_inputs.pb as build metrics.
This will count the number of input files and required git projects,
with the number of files for each project.

Bug: 241033491
Test: $ cp .repo/manifests/default.xml out/dist/manifest_1.xml
      $ development/multitree/build_vendor.sh -d vsoc_x86_64 \
          -p cf_x86_64_phone -r out/dist -i 1
Change-Id: Ie185863f1c8fca313baba6135374d509e2d93937
2022-08-29 15:20:12 +09:00
Mu-Le Lee
766198a5fd Merge "Update README in header checker for header-abi-diff configuration" am: d8fdf8bc91
Original change: https://android-review.googlesource.com/c/platform/development/+/2183578

Change-Id: I7141635e84a2799ccd3076662b153b2ffa638e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 13:23:19 +00:00
Mu-Le Lee
d8fdf8bc91 Merge "Update README in header checker for header-abi-diff configuration" 2022-08-26 12:59:18 +00:00
Mu-Le Lee
06f41abd76 Update README in header checker for header-abi-diff configuration
Add description of the config format and logic for developer to add
flags to header-abi-diff in Cross-Version ABI Check.

Test: no need
Bug: 239790286
Change-Id: I5b8fbe57aaafd1357495395a416a5d6b51f0ff3f
2022-08-26 11:19:46 +00:00
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