Commit Graph

33153 Commits

Author SHA1 Message Date
Treehugger Robot
dde4634a96 Merge "Remove py2 usages" am: d3d1bd6bc2 am: 288ccae0a5
Original change: https://android-review.googlesource.com/c/platform/development/+/2214966

Change-Id: Iceaba202d82a9f3978cb685549e25a2cab2c1467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:57:34 +00:00
Treehugger Robot
288ccae0a5 Merge "Remove py2 usages" am: d3d1bd6bc2
Original change: https://android-review.googlesource.com/c/platform/development/+/2214966

Change-Id: Id424d2e65d904411225b860c146bd59fe6ccf195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:25:30 +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
Mu-Le Lee
444b8495c4 Merge "Update README in header checker for option ignored_linker_set_keys" am: 3ccbbe8717 am: 2480451865
Original change: https://android-review.googlesource.com/c/platform/development/+/2200156

Change-Id: I633f9d280a199ff53ba06f962bfd525ae94e943b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:50:43 +00:00
Mu-Le Lee
3adceac986 Merge "Add option to ignore some specific LinkerSetKeys in header-abi-diff" am: a008152637 am: 2db1c829d5
Original change: https://android-review.googlesource.com/c/platform/development/+/2198080

Change-Id: I3752b0118f5dcbe1f5d94fa78ff520070ad99184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:50:34 +00:00
Mu-Le Lee
2480451865 Merge "Update README in header checker for option ignored_linker_set_keys" am: 3ccbbe8717
Original change: https://android-review.googlesource.com/c/platform/development/+/2200156

Change-Id: I34581fbecd9bfc42510851d8b7d6c5221c30ec72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:21:48 +00:00
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
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
f1f50ba37a Merge "Build dist to get build metrics" am: 9382092804 am: 8975672d19
Original change: https://android-review.googlesource.com/c/platform/development/+/2206555

Change-Id: Id27ef0a07459f429203afe789f69de3c45defff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 05:40:55 +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
c246d9a55b Merge "Fix module-file name collisions" am: 8e3e3530e8 am: b86f65e55c
Original change: https://android-review.googlesource.com/c/platform/development/+/2203455

Change-Id: I335ad855b2973dfa0d6639eae1b31c8d8d4c9003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 00:54:52 +00: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
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
cd712c9d5d Merge "Skip vndk variants check for vendor builds" am: 17a42834d3 am: af0c22dac1
Original change: https://android-review.googlesource.com/c/platform/development/+/2199757

Change-Id: I438ba5022c1c9916d81d98ecd4de958ee04ac235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 06:11: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
05a8694387 Merge "Generate ninja_inputs.pb as build metrics" am: 23862f4296 am: 9345b7f32e
Original change: https://android-review.googlesource.com/c/platform/development/+/2200276

Change-Id: Iaa710e8cf80cb78d52491a5c4377832af714c706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 02:18:01 +00: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
2422239114 Merge "Update README in header checker for header-abi-diff configuration" am: d8fdf8bc91 am: 766198a5fd
Original change: https://android-review.googlesource.com/c/platform/development/+/2183578

Change-Id: I755ae6d02e92fbebe964fed3b007761f48171e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 13:43:02 +00: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
e7e38016da Merge changes Ib62b19c1,I80a6ecd8,I37b9aa96,I4de409b3 am: 126ca5f962 am: 8ff398a773
Original change: https://android-review.googlesource.com/c/platform/development/+/2194760

Change-Id: I261fd10ecb8a75cd16048d89cebc509a9e64fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 19:23:34 +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
018823f6a7 Merge "Fix build_vendor script bug" am: 2056001c65 am: f6f0697324
Original change: https://android-review.googlesource.com/c/platform/development/+/2192193

Change-Id: I4d1e00b506479601be503827c39093f2dfed8d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 02:09:25 +00: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
db8f0c7c2d Merge "Fix array-related errorprone warnings" am: 159371eef5 am: 201f62aa05
Original change: https://android-review.googlesource.com/c/platform/development/+/2184500

Change-Id: I460f3c7f38846bf3044c7da263202e33d0efb847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 23:42:05 +00: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
b5b440b045 Merge "Fix header-abi-diff skips diff when config.json is not found" am: 3bf758113b am: cf474e4d59
Original change: https://android-review.googlesource.com/c/platform/development/+/2190085

Change-Id: I3dd5d77afd3f55d1a7da8e7b22d82ac92ea28db8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 15:58:08 +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