Commit Graph

33089 Commits

Author SHA1 Message Date
Bob Badour
4964db9772 Revert "Revert "Add license metadata to non-module targets.""
This reverts commit 696b533ad7.

Bug: 240149934

Test: m droid dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo

Change-Id: I1902bac43ab3a8337b344983df7b72f5f6c7ec76
2022-09-12 19:51:45 -07:00
Bob Badour
e541ed3b16 Merge "Revert "Add license metadata to non-module targets."" 2022-09-13 00:54:30 +00:00
Bob Badour
696b533ad7 Revert "Add license metadata to non-module targets."
This reverts commit 846c5acd90.

Reason for revert: breaks sdk target on aosp-master

Change-Id: Iea8f2c676533e61a5bea06d17719fea630340b20
2022-09-13 00:52:29 +00:00
Thiébaud Weksteen
0c211bf161 Merge "Remove e2fsdroid and sload_f2fs from platform sdk" 2022-09-12 23:51:31 +00:00
Treehugger Robot
e63705e7ca Merge "Add license metadata to non-module targets." 2022-09-12 21:07:31 +00:00
Treehugger Robot
d3d1bd6bc2 Merge "Remove py2 usages" 2022-09-12 20:57:30 +00:00
Cole Faust
d7b3122a24 Remove py2 usages
Bug: 203436762
Test: m nothing
Change-Id: I1ab26c5cfc28032700cb9d5454cbee1b7fd8cbd7
2022-09-12 12:32:22 -07:00
Bob Badour
846c5acd90 Add license metadata to non-module targets.
Bug: 240149934

Test: m droid dist

Change-Id: I2228a9e3b347eb5db97ab776098a563567a5ac2c
2022-09-09 16:54:13 -07:00
Mu-Le Lee
3ccbbe8717 Merge "Update README in header checker for option ignored_linker_set_keys" 2022-09-05 08:13:48 +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
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
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
Mu-Le Lee
173a9dd208 Update README in header checker for option ignored_linker_set_keys
NDK and platform Libraries are required to ensure the compatibility
across SDK version. However, some changes of a library that break its
ABI compatibility are necessary. Thus a ignored_linker_set_keys option
is added to let developers to skip some symobls.

Test: no need
Bug: 243903630
Change-Id: If6ca665189fdeec7c3e735a0f691dffd180ddc63
2022-08-31 09:08:44 +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
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