Commit Graph

33073 Commits

Author SHA1 Message Date
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
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
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
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
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
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
159371eef5 Merge "Fix array-related errorprone warnings" 2022-08-22 22:51:09 +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
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
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
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
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
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
e43c2bc9a7 Merge "Change the format of header-abi-diff config from .ini to .json" 2022-08-17 05:58:15 +00:00
Xin Li
4ce806fe1b Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:16 +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
Inseob Kim
2a458f6d14 Add multitree sample build script
Bug: 233327677
Test: manual
Change-Id: Ia83982911606a8cd8fb43d3bce211d5450d2997b
2022-08-10 11:33:26 +09:00
Treehugger Robot
fc8e1abc67 Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: Ida5e332f83e60d6f3c427e4c85718a031f2b76b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 08:08:07 +00:00
Treehugger Robot
9428c27824 Merge "Fix the incorrect prebuilts-info in aosp-master-boot" 2022-08-02 07:44:25 +00:00
Howard Chen
8013679744 Fix the incorrect prebuilts-info in aosp-master-boot
Bug: 241050793
Test: \
    development/gsi/build_with_kernel/repack_kernels.sh aarch64 \
    development/gsi/build_with_kernel/update_kernel_prebuilts_510_arm64.sh \
    development/gsi/build_with_kernel/update_kernel_prebuilts_515_arm64.sh \
    build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=gki_arm64 TARGET_BUILD_VARIANT=user DIST_DIR=%dist_dir% droid dist \
    development/gsi/build_with_kernel/kernel_info_to_dist.sh aarch64

Change-Id: I6ee2e6a5dfbc4e3105bfcdf7191dd306edb59b4c
2022-08-02 14:28:18 +08:00
Treehugger Robot
3d35ced879 Merge "Fix license_collector" am: e32fd5baaa
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323

Change-Id: I93e1094c97f7f8fc278be876d2b35a68660e9dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 07:46:24 +00:00
Treehugger Robot
e32fd5baaa Merge "Fix license_collector" 2022-07-29 07:21:46 +00:00
Justin Yun
1bd0e29bc8 Fix license_collector
This fixes a bug for the VNDK license collector that fails to get the
license kinds when a path is given.

Bug: 192434786
Test: python3 development/vndk/snapshot/gen_buildfiles.py -vv 29
Change-Id: I101b08b97cfc1229f4e0c67fa66341d4b49fa201
2022-07-29 06:33:43 +00:00
Frederick Mayle
941ee91b23 Merge "cargo2android: Fix edge case in --add_workspace feature" am: 4b4779ae81
Original change: https://android-review.googlesource.com/c/platform/development/+/2166722

Change-Id: I34dc1145ba925dfedd031755615f6926323a6cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 22:17:30 +00:00
Frederick Mayle
4b4779ae81 Merge "cargo2android: Fix edge case in --add_workspace feature" 2022-07-28 21:54:59 +00:00