Commit Graph

58634 Commits

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

Change-Id: Ic9cce0d12bd1f8cb72fb459063ffe289ce55d889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 23:55:40 +00:00
Treehugger Robot
1c0be10898 Merge "Implement mixed builds for apex modules, take 2." am: 88e7512572 am: 953254b150
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167802

Change-Id: I52202e3bdcab33d00a63008c1219aa7cf4140641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 23:32:01 +00:00
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
e288f38daa Merge "Implement bp2build for linker_config" am: 2f384a7432 am: ce91531649 am: 5d6bea6671
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115194

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

Change-Id: Idf5718d6ef3e421f2731bdea871ec0684d0f3b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:38:45 +00:00
Alix Espino
5d6bea6671 Merge "Implement bp2build for linker_config" am: 2f384a7432 am: ce91531649
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115194

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

Change-Id: I9a84fa9865cff567df403688dc9636badb26a762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:22:27 +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
edec0987b1 rust: Rust is now GA for platform usage am: cf3844c879 am: 494fccd98f am: 399519edca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168482

Change-Id: Iefba36b626e8e17cd6ff984216b1857f33863d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 21:42:57 +00:00
Matthew Maurer
399519edca rust: Rust is now GA for platform usage am: cf3844c879 am: 494fccd98f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168482

Change-Id: I1aa0094bd4c54e1ea31694af765a46e2d4e2ac4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 21:16:25 +00: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
318d8c51f2 Merge "Disallow '_' in bpf source name" am: d8cded58fe am: 9b259932f7 am: 8219d90a58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147825

Change-Id: Ie200e91f401c39014fcf2f5531095ec480ee81a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 08:28:08 +00:00
Ken Chen
8219d90a58 Merge "Disallow '_' in bpf source name" am: d8cded58fe am: 9b259932f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147825

Change-Id: I3c947dba5da6364807fd69bcdb21fba683586804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 08:03:59 +00: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
323015fda6 Merge "fix typo in AARImport prebuilt type assertion" am: 28ee99f3c3 am: 77f6fef4ed am: 0fe2d25263
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2164784

Change-Id: Ie5cbc90d8fb2e16563c152e971913d8b0e393105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 18:45:26 +00:00
Treehugger Robot
0fe2d25263 Merge "fix typo in AARImport prebuilt type assertion" am: 28ee99f3c3 am: 77f6fef4ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2164784

Change-Id: Iad9803c7168a5182329c5038abbb5e922ef78e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 17:46:24 +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
87b3ef440b Merge "Revert "Implement mixed builds for apex modules."" am: 0bb7f0494e am: 2fb081fd28 am: 3346a24aef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165026

Change-Id: Iaa424b5a53a12b43f2b01f93da83318dbc17b6b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 15:31:37 +00:00
Martin Stjernholm
3346a24aef Merge "Revert "Implement mixed builds for apex modules."" am: 0bb7f0494e am: 2fb081fd28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165026

Change-Id: I6c9ce0f6d60cd00c467515df52b172c6b5ab0c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 15:04:28 +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
94b3ca5b10 Merge "Add top level and per-mutator traces to soong_build" am: b7873a8b0f am: 8e269418c2 am: 64fe25d29d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2119953

Change-Id: I966563e48d5dfe0d6faf07682cad40b264c466ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 20:43:07 +00:00
Joe Onorato
64fe25d29d Merge "Add top level and per-mutator traces to soong_build" am: b7873a8b0f am: 8e269418c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2119953

Change-Id: I99f49413c25ccf2e2e936afed51ecd2f2dc4031f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 20:26:12 +00: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
49241fbdb6 Merge "Move LLNDK ABI dumps from vndk/ to platform/" am: 6f84b7763e am: c56d40cb54 am: 6f88e0e1e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147824

Change-Id: I64c490d1aa2e7855cd9353a035ff8ead6c2ecb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 11:56:20 +00:00
Mu-Le Lee
6f88e0e1e9 Merge "Move LLNDK ABI dumps from vndk/ to platform/" am: 6f84b7763e am: c56d40cb54
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147824

Change-Id: Ie46f43f9fc563ec55c6beee426910081413c287b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 11:21:54 +00: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
84bbcb968c Merge "Downgrade/disable lint checks" am: b59a3dba02 am: ce19924dd8 am: a921a23c78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2141377

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

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

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

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

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

Change-Id: Ic06902ab32fd791e33f8c7034126f4e52f3d555e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 23:10:02 +00:00
Cole Faust
a921a23c78 Merge "Downgrade/disable lint checks" am: b59a3dba02 am: ce19924dd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2141377

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

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

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

Change-Id: Ic918cda7c06c3fee5261bbd081eedf2cd7c85efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 23:00:36 +00:00