Commit graph

51753 commits

Author SHA1 Message Date
Chih-hung Hsieh
9096a6b0c1 Merge "Prepare to obsolete -warnings-as-errors in tidy_flags" am: 6ba1a7d661
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122976

Change-Id: I7518da6632f8b9da20094046d8e7303688d75171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:48:31 +00:00
Yu Liu
56868c621b Merge "Support cc code coverage for mixed build" am: 57c1edc4d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2103671

Change-Id: I1e51589b6ad47517e0f277fb440a89bd8b11e3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:47:45 +00:00
Chih-hung Hsieh
6ba1a7d661 Merge "Prepare to obsolete -warnings-as-errors in tidy_flags" 2022-06-13 19:07:21 +00:00
Chris Wailes
0a02aba00e rustc-1.61.0.p2 Build 8709792
Bug: https://issuetracker.google.com/issues/232437287
Bug: https://issuetracker.google.com/issues/216192129
Test: m rust
Change-Id: I84d4b9e70a53c0f057a286b77eb7dea6161c03a8
2022-06-13 12:05:33 -07:00
Yu Liu
57c1edc4d9 Merge "Support cc code coverage for mixed build" 2022-06-13 18:57:50 +00:00
Paul Duffin
5556c5f17a Treat <x> and <x>_compressed prebuilt APEXes as being equivalent
(cherry picked from commit 1aa50564c7)

When extracting dex files from prebuilt APEXes the build fails if it
finds two or more prebuilt APEXes that could provide the dex files.
This change treats <x> and <x>_compressed APEXes as being the same
and always selects the uncompressed APEX.

Bug: 235284603
Test: m nothing
      # Added TestDuplicateButEquivalentDeapexersFromPrebuiltApexes
      # Failed without this change, works with it.
Merged-In: I805cb9dfa9f590c91585d75c4f4586b212b73d41
Change-Id: I805cb9dfa9f590c91585d75c4f4586b212b73d41
2022-06-13 13:16:53 +00:00
Andrew Scull
5f7dc84c7a Merge "Add rule for AVB signing an image" am: 83a02e4390
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121464

Change-Id: Ia9f6d24ae226b267d7a45a2ba6a2cb220eaf6eb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 11:11:07 +00:00
Andrew Scull
83a02e4390 Merge "Add rule for AVB signing an image" 2022-06-13 10:49:22 +00:00
Ulya Trofimovich
c68b289125 Revert "manifest_check.py: add uses-libraries propagaged via dex..."
Reason for revert: performance regression on AppStartup.
Reverted Changes:
I6522319a8:Dexpreopt: prepare to merge class loader context f...
Ic8528dffd:manifest_check.py: add uses-libraries propagaged v...

Bug: 235304939
Bug: 214255490
Change-Id: I054df19dbddb4897d07d74e51d7b651dfae85fbe
2022-06-13 09:06:44 +00:00
Usta Shrestha
dc1bfa3f3d Merge "Shellcheck warnings addressed" am: 523ce07e5c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121094

Change-Id: Ib859733e96ce1bb8577d32977e411ec77581040b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 03:36:13 +00:00
Chih-Hung Hsieh
794b81d9d1 Prepare to obsolete -warnings-as-errors in tidy_flags
* A follow up CL will set const NoWarningsAsErrorsInTidyFlags
  and make it an error to use -warnings-as-errors in tidy_flags.
* Append TidyGlobalNoChecks after local tidy_checks to disable some checks.
* Append TidyGlobalNoErrorChecks after local tidy_checks_as_errors
  (-warnings-as-errors) to allow some warnings globally.
* Move bugprone-signed-char-misuse and bugprone-branch-clone to
  globalNoErrorCheckList so we can find and fix some of those warnings.

Bug: 229801437
Test: WITH_TIDY=1 make; make tidy-soong_subset
Change-Id: I0128b859b7be6eb9bbda1916b89a6a471b052150
2022-06-12 20:25:43 -07:00
Usta Shrestha
523ce07e5c Merge "Shellcheck warnings addressed" 2022-06-13 03:16:57 +00:00
Treehugger Robot
d2c842be31 Merge "Allowlist apexer for bp2build" am: ab12f792c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115757

Change-Id: I041801dc06335e5815325f77f0a72591f47a45f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 00:26:31 +00:00
Treehugger Robot
ab12f792c0 Merge "Allowlist apexer for bp2build" 2022-06-13 00:05:53 +00:00
Andrew Scull
ebd61e9029 Add rule for AVB signing an image
This is used multiple times by Microdroid to generate signed images.

Test: build and microdroid tests
Bug: 234564414
Bug: 185115783
Change-Id: I7d0b2c9907913c8a42a02f9951f341d08b585b8e
2022-06-11 07:08:44 +00:00
Treehugger Robot
288d88b244 Merge "Revert "Keep minimal abort when enabling integer overflow check"" am: 85f2c4eadc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122286

Change-Id: I68370f350da0ab928239d01e103c6020887bc688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 03:58:24 +00:00
Treehugger Robot
85f2c4eadc Merge "Revert "Keep minimal abort when enabling integer overflow check"" 2022-06-11 03:32:19 +00:00
Jingwen Chen
d0645003cd Merge "bp2build: convert apex.logging_parent." am: c90a3cd6f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122357

Change-Id: I50b0b2cf6f6a0b9b10c1a3a2fb28c3c53a2b0f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 02:57:57 +00:00
Jingwen Chen
c90a3cd6f6 Merge "bp2build: convert apex.logging_parent." 2022-06-11 02:38:08 +00:00
Evgenii Stepanov
c480fbc5ef Revert "Keep minimal abort when enabling integer overflow check"
This reverts commit 34448f2430.

Reason for revert: RAM regression + something mainline related
Bug: b/235090315
Bug: b/235181175
Bug: b/233840743

Change-Id: Ia1d1b1428c19b1e297dc75618d640bdac81713b0
2022-06-10 19:47:26 +00:00
Colin Cross
96aad8abcf Merge "Use -fdebug-default-version=4 for assembly files" am: 49fc44f6b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2120563

Change-Id: Ibac6d479c1f18b0d0185357706e7e07bb70c718f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:45:41 +00:00
Treehugger Robot
28b9607224 Merge "Fix strip_prefix flags to strip install paths." am: 20b623da89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2120624

Change-Id: I07ecc609d4a5ce2fd4e5ed66e0bedc8d4f0be0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:45:22 +00:00
Chih-hung Hsieh
eae21b5c3d Merge "Disable tidy checks in TidyGlobalNoChecks" am: 6f9312127c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2120564

Change-Id: If11a030b4fc3cb6b3444f6aa4b918412aa2ab4ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:44:54 +00:00
Colin Cross
49fc44f6b2 Merge "Use -fdebug-default-version=4 for assembly files" 2022-06-10 18:32:35 +00:00
Treehugger Robot
20b623da89 Merge "Fix strip_prefix flags to strip install paths." 2022-06-10 18:07:41 +00:00
Chih-hung Hsieh
6f9312127c Merge "Disable tidy checks in TidyGlobalNoChecks" 2022-06-10 18:01:08 +00:00
Dan Willemsen
12204bfdd3 Merge "Strip ANSI codes for messages on simple terminals" am: dba288ceff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121312

Change-Id: I4cefcf5eff616340032e59518cda158445b40acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 14:36:37 +00:00
Yasin Kilicdere
a3cc2a6b11 Revert "Disallow -warnings-as-errors in tidy_flags" am: 5a8ce13c2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122465

Change-Id: I55466f50b327340707bb0b681eb09bd3ff927ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 14:36:05 +00:00
Dan Willemsen
dba288ceff Merge "Strip ANSI codes for messages on simple terminals" 2022-06-10 14:24:22 +00:00
Anton Hansson
778613a16b Mark hansson and paulduffin last resort reviewers
Changes in soong and other places should primarily be reviewed
by the build team.

Test: No
Change-Id: I96f8ec6165843883f53ba0034307fcddab6ff3c7
2022-06-10 14:23:24 +00:00
Yasin Kilicdere
5a8ce13c2a Revert "Disallow -warnings-as-errors in tidy_flags"
This reverts commit 2d481842b1.

Reason for revert: b/235569235#comment4

Change-Id: I5c87b1d5a1bdf0bad7f436c397688fe3fc20d04e
2022-06-10 12:18:07 +00:00
Chih-Hung Hsieh
f3a8ef4231 Disallow -warnings-as-errors in tidy_flags am: 2d481842b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2080669

Change-Id: Idefd96795413dcdbd63bd4d922f0e2e9e41b712b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 09:38:27 +00:00
Jingwen Chen
b732d7c765 bp2build: convert apex.logging_parent.
Test: CI
Fixes: 235559958

Change-Id: I7b578c67eedb0379603bcf2fc029d03facfbbb0f
2022-06-10 08:38:03 +00:00
Chih-Hung Hsieh
43b920e707 Disable tidy checks in TidyGlobalNoChecks
* Save repeated strings in TidyFlags of build.ninja rules.
* Some of these checks were disabled to upgrade clang-tidy.
  They could later be moved to TidyDefaultGlobalChecks and
  TidyExternalVendorChecks if not breaking the build.
  Some projects can then enable those checks locally.

Test: WITH_TIDY=1 make; make tidy-soong_subset
Change-Id: I70e4218c929e3c88f766f2c68c56c51356110e72
2022-06-09 17:58:41 -07:00
Bob Badour
c6ec9fb849 Fix strip_prefix flags to strip install paths.
Bug: 235331488

Test: m droid dist

Change-Id: I3cd2af5d90e46a4c983728bc9b2d941d6ffda229
2022-06-09 14:24:41 -07:00
Cole Faust
01243368d7 Allowlist apexer for bp2build
This also introduces a workaround for the fact that
apexer depends on aapt2, but aapt2 doesn't build
with bp2build yet. Aapt2 is removed from apexer's
requirements during bp2build.

Bug: 204244290
Test: ./build/bazel/ci/bp2build.sh
Change-Id: I837597ce035c7d5c06e1a3957166583a7a94b5c7
2022-06-09 13:28:25 -07:00
Usta Shrestha
2c9a5e3ddd Shellcheck warnings addressed
SC2236: use [[ -n "$var" ]] instead of [[ ! -z "$var" ]]
SC2035: use -- end of options, to accomodate filename w\ hyphens
SC2155: `local -r var=..` for readonly variable shellcheck ignores return value masking
SC2045: prefer glob to iteration over `ls`

Bug: N/A
Test: ran ./run_intergration_tests.sh
Change-Id: Iaf313857ecc417e855afd70c7455841b54b1c363
2022-06-09 15:47:05 -04:00
Chih-Hung Hsieh
2d481842b1 Disallow -warnings-as-errors in tidy_flags
* Also remove the undocumented complicated
  experiment to overwrite local warnings-as-errors.

Bug: 229801437
Test: WITH_TIDY=1 make; make tidy-soong_subset
Change-Id: I2fb32146b4685ab9f5198724c15c303f799b7a14
2022-06-09 11:12:10 -07:00
Colin Cross
cdcb680dbd Use -fdebug-default-version=4 for assembly files
-fdebug-default-version=5 is causing $TMPDIR to end up in the dwarf
debug data, which causes the buildbot results to be nondeterministic.
Pass -fdebug-default-version=4 for assembly files as a workaround.

Bug: 235105792
Test: lunch aosp_arm-userdebug && m libbase && llvm-dwarfdump --debug-line out/target/product/generic/symbols/system/lib/libbase.so
Change-Id: Ife04e3c898bbb1291f71b8365fbca854cd2d2b66
2022-06-09 11:08:50 -07:00
Liz Kammer
1ffde1b892 Merge "Migrate more unblocked modules." am: 2320e27eb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097187

Change-Id: I10b4e65d75c5b7aef7cc8ec8d1956a3fbee59656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 14:36:34 +00:00
Liz Kammer
2320e27eb1 Merge "Migrate more unblocked modules." 2022-06-09 14:13:56 +00:00
Bob Badour
25ae3ce9b0 Merge "Fix Neural Networks API notice." am: 229b7c4234
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121038

Change-Id: I693fedfb14ec1acea716fcfa24d15dee26d390e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 14:01:16 +00:00
Bob Badour
229b7c4234 Merge "Fix Neural Networks API notice." 2022-06-09 13:32:08 +00:00
Alexei Nicoara
ffe4e6394e Merge "Passing the default apex version to the apexer" am: 5b96d35851
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104336

Change-Id: I8e43672285f5612f5f06730b144c2854a54a57e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 10:43:10 +00:00
Alexei Nicoara
5b96d35851 Merge "Passing the default apex version to the apexer" 2022-06-09 08:58:27 +00:00
Jingwen Chen
08ee8f7360 Merge changes Ib9a08167,I925e98d5 am: 1f0b70e7c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2119933

Change-Id: I01db0e69e91be974087126b6ab344bf72e871260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 07:50:55 +00:00
Jingwen Chen
1f0b70e7c0 Merge changes Ib9a08167,I925e98d5
* changes:
  Use prebuilt_etc for prebuilt modules in bp2build test, instead of pretending with a cc_library.
  Only override prebuilts property if the override_apex.prebuilts is explicitly specified (not nil).
2022-06-09 06:50:00 +00:00
Dan Willemsen
e2cdecf7ba Strip ANSI codes for messages on simple terminals
We had been doing this for actions, but not messages.

Test: m nothing && TERM=dumb m nothing
Bug: 235414673
Change-Id: I5c6c009490abe1d02a4ae2272bd1831bd7ca9f7f
2022-06-09 03:40:14 +00:00
Bob Badour
0d364eead5 Fix Neural Networks API notice.
Must quote the PackageName for embedded spaces.

Bug: 233936718

Test: m droid dist

Change-Id: Ida57800a9e733517f773faea92c90a357e0f58af
2022-06-08 18:20:27 -07:00
Cole Faust
c6cba0c3ba Merge "Make filegroup paths relative to module dir in mixed builds" am: 5c6ebfa08c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2116276

Change-Id: Iabe564c75aa43903bcabcbd61aede3c54f8452e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 22:30:31 +00:00