Commit Graph

57483 Commits

Author SHA1 Message Date
Treehugger Robot
9f7fa50427 Merge "Restrict IsSanitizerEnabled() to android.Config()." am: 1c6502eba2 am: 7125d5d606
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2127446

Change-Id: Ie6b578793fa05304b869795af4e0ca4455b75d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 23:05:53 +00:00
Anton Hansson
8014713a63 Merge "Mark hansson and paulduffin last resort reviewers" am: f9b03f2895 am: bbbc7bfb85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122466

Change-Id: I11152a80ea15ba747935f9e32cadf2858498b713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 23:05:44 +00:00
Treehugger Robot
7125d5d606 Merge "Restrict IsSanitizerEnabled() to android.Config()." am: 1c6502eba2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2127446

Change-Id: I26f923fcf0f5ab54348fd14e98c87757abb4f181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:27:10 +00:00
Anton Hansson
bbbc7bfb85 Merge "Mark hansson and paulduffin last resort reviewers" am: f9b03f2895
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122466

Change-Id: I60cb8942297c6d565a4c94184e7fde6adb6c89f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:26:59 +00:00
Pedro Loureiro
492128b526 Translate SDK codenames to SDK versions for finalized releases am: 489912283e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18965894

Change-Id: I67c2cd6d39d13ff9bf00b7da5986664da4ae95c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:00:47 +00:00
Pedro Loureiro
489912283e Translate SDK codenames to SDK versions for finalized releases
This applies to updatability attributes of shared libraries.

Bug: 235318264

Test: atest UpdatableSharedLibsTest
Change-Id: Id2c2b769a99ca1debb5d8525e46d37698ef2fc6c
2022-06-17 20:01:21 +00:00
Treehugger Robot
1c6502eba2 Merge "Restrict IsSanitizerEnabled() to android.Config()." 2022-06-17 15:44:24 +00:00
Anton Hansson
f9b03f2895 Merge "Mark hansson and paulduffin last resort reviewers" 2022-06-17 14:58:18 +00:00
Lukacs T. Berki
01a648afa0 Restrict IsSanitizerEnabled() to android.Config().
Turns out, the whole context is not needed and then let's not
plumb it any further than necessary.

Test: Presubmits.
Change-Id: I1a25738e5a6ca20dea0d973c2ce435b5e152399b
2022-06-17 08:59:37 +02:00
Treehugger Robot
b0070a5c8a Merge "Allow using include_top to filter results even when there is a constant prefix" am: 9b01216088 am: c0a1ee58de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2124399

Change-Id: Ie0e2f6f48d8328aa3e7a9a1d77d3a393754fbb41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 17:28:21 +00:00
Treehugger Robot
c0a1ee58de Merge "Allow using include_top to filter results even when there is a constant prefix" am: 9b01216088
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2124399

Change-Id: Ia56b2d60d38c40fb08d1c60cf417ae5c85e8f168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 17:08:54 +00:00
Treehugger Robot
9b01216088 Merge "Allow using include_top to filter results even when there is a constant prefix" 2022-06-15 16:48:46 +00:00
Treehugger Robot
0b2ae4f756 Merge "rustc-1.61.0.p2 Build 8709792" am: f9a0062916 am: 730ce4ff82
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2124594

Change-Id: I17757c68a3d4fbece0eaeef00fce2e7cfedb0158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 03:32:50 +00:00
Treehugger Robot
730ce4ff82 Merge "rustc-1.61.0.p2 Build 8709792" am: f9a0062916
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2124594

Change-Id: I302a49f168aad7a08a94cd5dbeb8410e292e4bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 03:14:29 +00:00
Treehugger Robot
f9a0062916 Merge "rustc-1.61.0.p2 Build 8709792" 2022-06-15 02:57:30 +00:00
Cole Faust
74ac027962 Allow using include_top to filter results even when there is a constant prefix
Previously, when seeing a `include foo/$(VAR)/bar.mk`, the include
tops wouldn't apply to filter down the results any further.

Allowing include_tops is useful here to prevent cycles in the
load graph.

Fixes: 236025787
Test: go test
Change-Id: I3ea445f222ee2283a68d4aca5002df750204076f
2022-06-14 13:40:32 -07:00
Paul Duffin
23c4dacadf [automerger skipped] Merge "Treat <x> and <x>_compressed prebuilt APEXes as being equivalent" am: d6f7851dee am: 4feb59ced4 -s ours
am skip reason: Merged-In I805cb9dfa9f590c91585d75c4f4586b212b73d41 with SHA-1 1aa50564c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122469

Change-Id: I6e2a5b543245592d3a78c9454886a514f19a849f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 20:27:30 +00:00
Paul Duffin
4feb59ced4 Merge "Treat <x> and <x>_compressed prebuilt APEXes as being equivalent" am: d6f7851dee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122469

Change-Id: I8e4c929ef325985d43d80a6cac467521e3d94eaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 19:58:59 +00:00
Paul Duffin
d6f7851dee Merge "Treat <x> and <x>_compressed prebuilt APEXes as being equivalent" 2022-06-14 18:49:49 +00:00
Chih-hung Hsieh
b4d031f788 Merge "Set NoWarningsAsErrorsInTidyFlags" am: 4fd41ddb4a am: 3850c88cbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122977

Change-Id: Ie41228e52143e4a24614c97e80b569c72e26c089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:16:02 +00:00
Christopher Parsons
2b9f5bdefc Merge "Use builtin CcSharedLibraryInfo for cquery" am: 0e36bc11e4 am: 38df4aeeb8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2112287

Change-Id: Ib656e23fa69e0482bd1239a06eb6147fc4476b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:15:44 +00:00
Chih-hung Hsieh
3850c88cbc Merge "Set NoWarningsAsErrorsInTidyFlags" am: 4fd41ddb4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122977

Change-Id: I9c1647d979a2078cba21dbb38af51fe257e537c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:57:06 +00:00
Christopher Parsons
38df4aeeb8 Merge "Use builtin CcSharedLibraryInfo for cquery" am: 0e36bc11e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2112287

Change-Id: Iedc0d1c4cfffc40275211b3ec0458e4ddaa3c1d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:56:46 +00:00
Chih-hung Hsieh
4fd41ddb4a Merge "Set NoWarningsAsErrorsInTidyFlags" 2022-06-14 16:48:50 +00:00
Christopher Parsons
0e36bc11e4 Merge "Use builtin CcSharedLibraryInfo for cquery" 2022-06-14 16:27:18 +00:00
Chih-Hung Hsieh
9f876e9eab Set NoWarningsAsErrorsInTidyFlags
* Reject -warnings-as-errors in the tidy_flags.
* Fix one grammar error in comment.

Bug: 229801437
Test: WITH_TIDY=1 make; make tidy-soong_subset
Change-Id: I4fae229add65131b64cd5a1d06507d27198010ed
2022-06-13 23:58:12 +00:00
Treehugger Robot
3921e668d6 Merge "Revert "manifest_check.py: add uses-libraries propagaged via dex..."" am: 802b059417 am: 8649f49ec0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2123352

Change-Id: Ia939fea85508c822d6f8b909f768804b990cfcda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 23:30:05 +00:00
Treehugger Robot
8649f49ec0 Merge "Revert "manifest_check.py: add uses-libraries propagaged via dex..."" am: 802b059417
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2123352

Change-Id: I5f6bbfc3b9695bacbf7914626f238759c25f2377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 23:03:12 +00:00
Treehugger Robot
802b059417 Merge "Revert "manifest_check.py: add uses-libraries propagaged via dex..."" 2022-06-13 22:21:40 +00:00
Chih-hung Hsieh
88054dac68 Merge "Prepare to obsolete -warnings-as-errors in tidy_flags" am: 6ba1a7d661 am: 9096a6b0c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2122976

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

Change-Id: Ibe7fab143ee1ebbdbe4df73c1d173cc9c3c5a315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:16:29 +00:00
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
Romain Jobredeaux
d7c05d8358 [automerger skipped] Merge "Allow empty zip file in extra files in install command." into tm-dev am: 9e8e7d7b86 -s ours
am skip reason: Merged-In I4c8d1b16f2232d4cda75467615779145d2c7315e with SHA-1 1cef629459 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18817016

Change-Id: Iffce915309e6fa82e86fc6fd1a528be8a2c5d2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 14:04:55 +00:00
Romain Jobredeaux
43acf54671 [automerger skipped] Allow empty zip file in extra files in install command. am: 84efaf45bf -s ours
am skip reason: Merged-In I4c8d1b16f2232d4cda75467615779145d2c7315e with SHA-1 1cef629459 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18817016

Change-Id: I804b462e3e48f606cfe3851a4a58825db7fbf9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 14:04:54 +00:00
Romain Jobredeaux
9e8e7d7b86 Merge "Allow empty zip file in extra files in install command." into tm-dev 2022-06-13 13:24:06 +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
1a866e4cf4 Merge "Add rule for AVB signing an image" am: 83a02e4390 am: 5f7dc84c7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121464

Change-Id: I09bbec7f84212ea0c2161eba3c8ec82587c1c9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 11:31:34 +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
16f3d6eb4c Merge "Shellcheck warnings addressed" am: 523ce07e5c am: dc1bfa3f3d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121094

Change-Id: I016205891108872d0b946bf9072fc6b362fb6711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 03:55:41 +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
af5e7280a5 Merge "Allowlist apexer for bp2build" am: ab12f792c0 am: d2c842be31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115757

Change-Id: I939c1813093cdb3a09f9508ec03b186e2d298e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 00:46:24 +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