Commit graph

57867 commits

Author SHA1 Message Date
Treehugger Robot
953254b150 Merge "Implement mixed builds for apex modules, take 2." am: 88e7512572
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167802

Change-Id: I9efd3c2e6f8c93aa8d1add3cbe6802e24d73b084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 23:06:00 +00:00
Treehugger Robot
88e7512572 Merge "Implement mixed builds for apex modules, take 2." 2022-07-29 22:43:19 +00:00
Alix Espino
ce91531649 Merge "Implement bp2build for linker_config" am: 2f384a7432
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115194

Change-Id: Ia56cfb86085ec45fd54bbfa2b2ab82d72ed1d940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 18:49:21 +00:00
Alix
33032667e0 filter unknown clang cflags in bp2build am: 1be00d4e48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137955

Change-Id: I1a586c5fe3ffd7f3c767bcd9c79d9d00cfde4302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 18:48:30 +00:00
Alix Espino
2f384a7432 Merge "Implement bp2build for linker_config" 2022-07-29 18:19:00 +00:00
Alix
1be00d4e48 filter unknown clang cflags in bp2build
filtering out no longer useful flags in bp2build conversion

Test: cc_library_shared_conversion_test
Bug: 231995978
Change-Id: I5172f6d07a8928291bbc11bd8802678b33cc5b1f
2022-07-29 12:17:25 +00:00
Sasha Smundak
fe9a5b833d Implement mixed builds for apex modules, take 2.
* Add ApexCqueryInfo to obtain apex artifacts used by the makefile
  generator and downstream modules
* Refactor code common to GenerateAndroidBuildActions and ProcessBazelQueryResponse
* Implement android.MixedBuildBuildable for modules
* Enable mixed build for apex modules with payload_type:"image"

The first take 6a2b7c40b was setting compressed APEX suffix incorrectly, and
was reverted in 8a3c91494.

Fixes: 239925080 239695521 232085015
Test: treehugger
Change-Id: I1720f8db3c7cc773183d25a815d9b7eeaf7c73ad
2022-07-28 14:43:50 -07:00
Matthew Maurer
494fccd98f rust: Rust is now GA for platform usage am: cf3844c879
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168482

Change-Id: I8977e2631135b64c0c399bf7969bc080188b6061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 20:57:25 +00:00
Matthew Maurer
cf3844c879 rust: Rust is now GA for platform usage
Rust is now approved for general platform use without project-specific
review.

Bug: 240501326
Test: m
Change-Id: I6fd4c22ba2c6a3a5bac6f91fd087fe5cffe46c01
2022-07-28 06:57:26 -07:00
Ken Chen
9b259932f7 Merge "Disallow '_' in bpf source name" am: d8cded58fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147825

Change-Id: Ia3ea5b08ccd37f096ad7d9cd053a45b25b045ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 07:21:56 +00:00
Ken Chen
d8cded58fe Merge "Disallow '_' in bpf source name" 2022-07-28 07:00:12 +00:00
Treehugger Robot
77f6fef4ed Merge "fix typo in AARImport prebuilt type assertion" am: 28ee99f3c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2164784

Change-Id: Ic3ae553b8d16478367a1df7cde46981052841e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 17:19:32 +00:00
Treehugger Robot
28ee99f3c3 Merge "fix typo in AARImport prebuilt type assertion" 2022-07-26 16:58:31 +00:00
Martin Stjernholm
2fb081fd28 Merge "Revert "Implement mixed builds for apex modules."" am: 0bb7f0494e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165026

Change-Id: I375077ee73ba18308d0841ca76956757935dd992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 14:08:18 +00:00
Martin Stjernholm
0bb7f0494e Merge "Revert "Implement mixed builds for apex modules."" 2022-07-26 13:52:18 +00:00
Martin Stjernholm
8a3c914942 Revert "Implement mixed builds for apex modules."
Revert submission 2147387-mixed_builds

Reason for revert: Breaks zipapex build on git_master-art-host
Bug: 239925080
Reverted Changes:
I9f1e03e5e:Implement mixed builds for apex modules.
I13d9a0270:Add container and bundle encription key pairs to t...

Change-Id: I0eaad4dd81cac16d634f4c9cec18137a38e30d47
2022-07-26 09:35:39 +00:00
Sam Delmerico
af8bb7008a fix typo in AARImport prebuilt type assertion
This looks like it may have been a typo'd copy paste or maybe a name
change that got forgotten about.

Test: CI
Change-Id: I9f5c17f8e2d11b9cf6cd0da4685d719cdbbdcc11
2022-07-25 15:39:32 -04:00
Joe Onorato
8e269418c2 Merge "Add top level and per-mutator traces to soong_build" am: b7873a8b0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2119953

Change-Id: I1eac9397bb99df6b666ed872d4a4256188190544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 20:00:02 +00:00
Joe Onorato
b7873a8b0f Merge "Add top level and per-mutator traces to soong_build" 2022-07-22 19:28:53 +00:00
Joe Onorato
2e5e401722 Add top level and per-mutator traces to soong_build
- Top-level trace for all soong_build runs
  - Includes adding Peek() to OncePer because not all soong_build
    invocations have GenerateBuildActions run.
- A trace per mutator invocation

Test: m && build/bazel/scripts/print_analysis_metrics.py
Change-Id: Ief5c04630484fb38ec7e3757de45c7dc294d3b3c
2022-07-22 10:01:35 -07:00
Mu-Le Lee
c56d40cb54 Merge "Move LLNDK ABI dumps from vndk/ to platform/" am: 6f84b7763e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147824

Change-Id: Id6244f29c95d41aeb7c7207fc741fa70e74307b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 11:03:05 +00:00
Mu-Le Lee
6f84b7763e Merge "Move LLNDK ABI dumps from vndk/ to platform/" 2022-07-22 10:44:06 +00:00
Cole Faust
ce19924dd8 Merge "Downgrade/disable lint checks" am: b59a3dba02
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2141377

Change-Id: I59fe86bafba8f58d33cfb4b2a408f97fa366c2e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:30:59 +00:00
Treehugger Robot
afa6a56bd4 Merge "Fix typo" am: 576bacae1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2162377

Change-Id: I4f74dac3e4eb4ecddd72e06d0388a0f39a381af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:30:23 +00:00
Treehugger Robot
2c591be386 Merge "Deprecate notice property." am: 06776d6b6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2161180

Change-Id: I8807a4bf6417077857703fb2a26824f37d047d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:30:12 +00:00
Treehugger Robot
7394062b10 Merge "Add option to allow unknown warning options" am: 485127c76e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2161661

Change-Id: I7b659585ddf16e206a1f6e5d6abc94df87d90636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:29:58 +00:00
Paul Duffin
fa26f65155 Merge "Export any platform_compat_config used by apex to sdk snapshot" am: 69d09f49ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160797

Change-Id: Icb98af219a66d7ad48518ac49c6150798361f62b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:29:39 +00:00
Treehugger Robot
6d84fa2212 Merge "Update clang version to clang-r458507" am: a9eef7bd2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160498

Change-Id: I6caf51563be9c4df4f8894af4c4cb880f8fd7e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:29:23 +00:00
Cole Faust
b59a3dba02 Merge "Downgrade/disable lint checks" 2022-07-21 19:57:17 +00:00
Treehugger Robot
576bacae1d Merge "Fix typo" 2022-07-21 17:32:49 +00:00
Treehugger Robot
06776d6b6a Merge "Deprecate notice property." 2022-07-21 14:19:28 +00:00
Treehugger Robot
485127c76e Merge "Add option to allow unknown warning options" 2022-07-21 12:23:28 +00:00
Paul Duffin
69d09f49ec Merge "Export any platform_compat_config used by apex to sdk snapshot" 2022-07-21 10:39:27 +00:00
jiajia tang
cd1c27b33f Fix typo
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Change-Id: I23bec7b08c11c33a06dd13eb7b60ea38d4f26a11
2022-07-21 18:04:37 +08:00
Yi Kong
f7f69e4992 Add option to allow unknown warning options
Some build targets pulls cflags from build/soong but has its own choice
of compiler version. This causes errors for due to unknown warning
options. This allows them to suppress such checks.

Test: presubmit
Change-Id: Ia89508d6b92481fb1ed0c90f1fdb4d8e54566349
2022-07-21 15:49:05 +08:00
Treehugger Robot
a9eef7bd2d Merge "Update clang version to clang-r458507" 2022-07-21 07:01:29 +00:00
Yi Kong
eb8d04e589 Update clang version to clang-r458507
Test: presubmit
Bug: 236798112
Change-Id: Iff8df2b5c7faf359d0554994586bbc984b7a1856
2022-07-21 06:43:09 +00:00
Yi-Yo Chiang
456dcd17b7 Remove $PRODUCT_OUT/vendor_kernel_ramdisk on installclean am: da44795563
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160499

Change-Id: If19a89bedcd28274aa3a6e6d6090f918b7c29120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 04:12:58 +00:00
Yi-Yo Chiang
da44795563 Remove $PRODUCT_OUT/vendor_kernel_ramdisk on installclean
Make sure the staging directory doesn't have stale file after
installclean.

Test: m installclean && ls $ANDROID_PRODUCT_OUT
Change-Id: Idcd7a883a6cba4b7eb1eb99751f5d03cba365a12
2022-07-21 03:52:02 +00:00
Bob Badour
124f3fe855 Deprecate notice property.
Bug: 192434786

Test: m droid dist

Change-Id: Id47ff3c945b556ea0452a91305f7637bbcc35008
2022-07-20 14:37:13 -07:00
Colin Cross
51f78cf74c Merge "Revert "Make FirstTarget treat HostCross separately from Host"" am: 7d9f760705
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2161176

Change-Id: I589d42d93b90c766a0a70be461aa7f0a70e7bd52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 17:44:54 +00:00
Charisee Chiw
53d2d186c1 Merge "rustc-1.62.0.p1 Build 8836667" am: b5aa16f340
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2156350

Change-Id: I688a80a00a35a610f46f2adf74375417729f60d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 17:43:10 +00:00
Colin Cross
7d9f760705 Merge "Revert "Make FirstTarget treat HostCross separately from Host"" 2022-07-20 17:38:53 +00:00
Colin Cross
3b56c92977 Revert "Make FirstTarget treat HostCross separately from Host"
This reverts commit c5d7ad6b68.

Reason for revert: Speculatively reverting as likely cause of mac build breakage

Change-Id: I30fbbaaac28f3a2fe8bc1c05775d3de248199b29
2022-07-20 17:37:37 +00:00
Charisee Chiw
b5aa16f340 Merge "rustc-1.62.0.p1 Build 8836667" 2022-07-20 17:13:27 +00:00
Colin Cross
be076a0c7e Merge "Make FirstTarget treat HostCross separately from Host" am: 0243999864
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160016

Change-Id: I879353c72a52b0ed98c39dfbf9ae5b278209198e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 16:26:07 +00:00
Colin Cross
0243999864 Merge "Make FirstTarget treat HostCross separately from Host" 2022-07-20 15:49:47 +00:00
Alexander Smundak
cc4c994a8b Merge "Revert "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set."" am: 0c1b781de5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2090466

Change-Id: Ie1be415109536a8b4aaaec42452e0b18102ca365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 14:30:19 +00:00
Paul Duffin
fcf79850d8 Export any platform_compat_config used by apex to sdk snapshot
Previously, the platform_compat_config modules needed to be explicitly
listed in the sdk snapshot and the apex. This change will automatically
export them to the sdk snapshot when the apex is listed in its apexes
property.

Bug: 232401814
Test: m tethering-module-sdk
      # Before this change the generated snapshot did not contain the
      # platform_compat_config, after this change it did.
      m art-module-sdk
      # As that explicitly specifies the platform_compat_config in its
      # compat_configs property this change has no effect.
Change-Id: Ia854b9a52db2b1619fca41a387ce98d7f9f9efe9
2022-07-20 14:18:24 +00:00
Alexander Smundak
0c1b781de5 Merge "Revert "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set."" 2022-07-20 14:10:32 +00:00