Commit Graph

58571 Commits

Author SHA1 Message Date
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
Paul Duffin
4dcb86de2c Merge "Export any platform_compat_config used by apex to sdk snapshot" am: 69d09f49ec am: fa26f65155
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160797

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

Change-Id: I04c2d15cc608046c076faae0dcfdfdfacefa75be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:53:10 +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
Paul Duffin
69d09f49ec Merge "Export any platform_compat_config used by apex to sdk snapshot" 2022-07-21 10:39:27 +00: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
3d958c40db Remove $PRODUCT_OUT/vendor_kernel_ramdisk on installclean am: da44795563 am: 456dcd17b7 am: b34c9be38b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160499

Change-Id: I64921de1b72b991595ca90aa22526959f9b9131a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 04:55:51 +00:00
Yi-Yo Chiang
b34c9be38b Remove $PRODUCT_OUT/vendor_kernel_ramdisk on installclean am: da44795563 am: 456dcd17b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160499

Change-Id: I6874d79bdea28cf071ea5d5974dcb15230d901f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 04:38:29 +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
Colin Cross
1dea1b44aa Merge "Revert "Make FirstTarget treat HostCross separately from Host"" am: 7d9f760705 am: 51f78cf74c am: 26e8b58b11
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2161176

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

Change-Id: I1bb26895c532a2b836e626253350ad8426d9b2fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 18:26:27 +00:00
Colin Cross
26e8b58b11 Merge "Revert "Make FirstTarget treat HostCross separately from Host"" am: 7d9f760705 am: 51f78cf74c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2161176

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

Change-Id: Ie1980e29b3f3ce589917735819a23fee7a20dc66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 18:08:36 +00: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
Colin Cross
5a5e65badc Merge "Make FirstTarget treat HostCross separately from Host" am: 0243999864 am: be076a0c7e am: 8cec839ecb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160016

Change-Id: I3eecb9cc5228da5cdd271d6d7dab7ab42d41ee5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 17:35:29 +00:00
Charisee Chiw
b5aa16f340 Merge "rustc-1.62.0.p1 Build 8836667" 2022-07-20 17:13:27 +00:00
Colin Cross
8cec839ecb Merge "Make FirstTarget treat HostCross separately from Host" am: 0243999864 am: be076a0c7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160016

Change-Id: I649ea7abcb80ef571990d9cd1d343171e94d6467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 16:53:55 +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
a7570e7caf Merge "Revert "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set."" am: 0c1b781de5 am: cc4c994a8b am: cb7c93a815
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2090466

Change-Id: I99bbe156597043e7b2685b10325b603282fbf996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 15:13:14 +00:00
Alexander Smundak
cb7c93a815 Merge "Revert "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set."" am: 0c1b781de5 am: cc4c994a8b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2090466

Change-Id: I5cbe296d29534265702623f98d005f91d3028f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 14:48:53 +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
Colin Cross
c5d7ad6b68 Make FirstTarget treat HostCross separately from Host
Use Target.Os and Target.HostCross as the key in FirstTarget so that
it returns a separate target for host and host cross architectures.
This is useful when host and host cross are both linux_musl, but
host cross is an independenct architecture like arm64.

Bug: 236052820
Test: cross compile linux_musl-arm64
Change-Id: If75790001afe9d0f9d4d8166f207847851812297
2022-07-19 14:44:34 -07:00
Yi Kong
f9bd128550 Merge "Enable -Wmisleading-indentation for 1p projects" am: 1b3d5f836c am: f77a1a55f8 am: 738a6b6ab0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099784

Change-Id: I14c21f95196c302ab26653440a0396be661d778f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 17:49:17 +00:00
Yi Kong
738a6b6ab0 Merge "Enable -Wmisleading-indentation for 1p projects" am: 1b3d5f836c am: f77a1a55f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099784

Change-Id: I31ca6b40c205a56cc63d304da204932c01dcc718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 17:29:56 +00:00
Yi Kong
f77a1a55f8 Merge "Enable -Wmisleading-indentation for 1p projects" am: 1b3d5f836c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099784

Change-Id: Ifd673171b918739bb800cf9a5a8410d8a057e115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 17:11:24 +00:00
Yi Kong
1b3d5f836c Merge "Enable -Wmisleading-indentation for 1p projects" 2022-07-19 16:53:32 +00:00
Sasha Smundak
2cec8df3a8 Revert "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set."
Reverts commit 827aead340
The change being reverted is the result of misunderstanding of how the
status system works. It has to be reverted because it would suppress
_all_ error messages from Make. Achieving what this change purports is
is more involved and requires changing the code to separate progress message
stream from application output stream.

Test: run failing build with ANDROID_QUIET_BUILD=tree and observe errors being output
Change-Id: If9148a7fa773ae32fb0870a448e9470560e53900
2022-07-19 08:02:42 -07:00
Alexander Smundak
b03415acb7 Merge "Output informational messages only when BP2BUILD_VERBOSE is set." am: 7c81cf6e4e am: 29250703b8 am: 34233721a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2101862

Change-Id: I390f9977676701a5c7d71ac7246b0cf071e0f487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 14:37:53 +00:00
Alexander Smundak
035e5fddd8 Merge "Implement mixed builds for apex modules." am: 9ec1ff98b7 am: f7ccf8c822 am: 34a6bda87e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104104

Change-Id: Id4c40168a5c2a16a7381f3e1d82b14d1b9753d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 14:37:42 +00:00
Alexander Smundak
34233721a5 Merge "Output informational messages only when BP2BUILD_VERBOSE is set." am: 7c81cf6e4e am: 29250703b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2101862

Change-Id: I135852fc76fed7429144678ff14d3c1bf7b9258c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 14:18:49 +00:00
Alexander Smundak
34a6bda87e Merge "Implement mixed builds for apex modules." am: 9ec1ff98b7 am: f7ccf8c822
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104104

Change-Id: I50dba006d9aa9dd5bd6f2bc370f8423cdad949a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 14:18:36 +00:00
Alexander Smundak
29250703b8 Merge "Output informational messages only when BP2BUILD_VERBOSE is set." am: 7c81cf6e4e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2101862

Change-Id: I61c1247a8c03b5acc7bbd7361263047141a77031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 13:59:34 +00:00
Alexander Smundak
f7ccf8c822 Merge "Implement mixed builds for apex modules." am: 9ec1ff98b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104104

Change-Id: I1fb794735088c8d69bd425cbe6a9d4b62b9ca43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 13:59:21 +00:00
Alexander Smundak
7c81cf6e4e Merge "Output informational messages only when BP2BUILD_VERBOSE is set." 2022-07-19 13:39:44 +00:00
Alexander Smundak
9ec1ff98b7 Merge "Implement mixed builds for apex modules." 2022-07-19 13:38:55 +00:00
Elliott Hughes
f08a664127 Enable -Wmisleading-indentation for 1p projects
Bug: http://b/232926688
Test: treehugger
Change-Id: I7e3458f23e9b2e7a229a4a3eada5d98bdf4731d0
2022-07-19 11:51:59 +00:00
Paul Duffin
e088150020 Merge "Sort files in sdk snapshot zip to ensure consistent behavior" am: c5e02caef3 am: 6b7986ab0b am: 3763ed6f51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2153655

Change-Id: I588f976f5a3606b104985b5d462a309e0c3e4c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 11:22:54 +00:00
Paul Duffin
3763ed6f51 Merge "Sort files in sdk snapshot zip to ensure consistent behavior" am: c5e02caef3 am: 6b7986ab0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2153655

Change-Id: I2651db80c7bbcb20d97a95e89b95de9f8a9bcebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 11:03:46 +00:00
Paul Duffin
6b7986ab0b Merge "Sort files in sdk snapshot zip to ensure consistent behavior" am: c5e02caef3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2153655

Change-Id: Ia2621bbaf5ca1c5149476a4b4794ff55881e920b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 09:51:31 +00:00
Paul Duffin
c5e02caef3 Merge "Sort files in sdk snapshot zip to ensure consistent behavior" 2022-07-19 09:26:25 +00:00