Commit Graph

40521 Commits

Author SHA1 Message Date
Jaewoong Jung 4377971d03 Merge "Revert "Revert "Add min_sdk_version to java_import.""" am: d0afefa4b1 am: f7c8d8a746
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663082

Change-Id: I42a5320bb4256b0d71e4060fb31ad01ac401dabb
2021-04-02 16:49:32 +00:00
Colin Cross 17fd50923a Merge "Silence kotlinc JDK9 warnings" am: 2fbc234fd6 am: 107c6aaef5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656462

Change-Id: Iedea65d318cbec535244763b9a67569dada26600
2021-04-02 16:49:11 +00:00
Ivan Lozano c044f5bce8 rust: Update libfuzzer flags for rust_fuzz
libfuzzer-sys uses different flags in the 0.4.0 update, so update the
flags for rust_fuzz modules to align.

Test: m <example_fuzzer>
Change-Id: I0a1eb140a7843fdaf5266c05a1ecf6d3964e0f5e
2021-04-02 12:43:28 -04:00
Jaewoong Jung f7c8d8a746 Merge "Revert "Revert "Add min_sdk_version to java_import.""" am: d0afefa4b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663082

Change-Id: I3c9fb749aa4584e158696f16a43eb2ef0f712568
2021-04-02 16:27:17 +00:00
Colin Cross 107c6aaef5 Merge "Silence kotlinc JDK9 warnings" am: 2fbc234fd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656462

Change-Id: If91250912aec76e676ae4c0180f69e9c1c4a6e36
2021-04-02 16:10:51 +00:00
Steven Moreland f42daa716c Merge "Export header check allows WholeStaticLibs" 2021-04-02 16:03:59 +00:00
Jaewoong Jung d0afefa4b1 Merge "Revert "Revert "Add min_sdk_version to java_import.""" 2021-04-02 15:49:58 +00:00
Colin Cross 2fbc234fd6 Merge "Silence kotlinc JDK9 warnings" 2021-04-02 15:39:13 +00:00
Liz Kammer 09f9231e91 Remove unused cquery requests.
Test: go test soong tests
Change-Id: Ie7a72bc73ccf4d9b8aa2a0b20c1674d3a5b499de
2021-04-02 11:03:15 -04:00
Liz Kammer 3cf5211890 Add bazel_module properties to cc_defaults
Test: go soong tests
Test: add bazel_module to Android.bp file and m nothing
Change-Id: I13c3e8d59536dbea88f3495309f4f64e849ede9f
2021-04-02 08:44:31 -04:00
Jingwen Chen 91220d7334 Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.

This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.

These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.

This enables //bionic/libc:libc_headers to be generated correctly, from:

    cc_library_headers {
        name: "libc_headers",
        target: {
            android: {
                header_libs: ["libc_headers_arch"],
                export_header_lib_headers: ["libc_headers_arch"],
            },
            linux_bionic: {
                header_libs: ["libc_headers_arch"],
                export_header_lib_headers: ["libc_headers_arch"],
            },
        },
        // omitted props
    }

to:

    cc_library_headers(
        name = "libc_headers",
        deps = [] + select({
            "//build/bazel/platforms/os:android": [
                ":libc_headers_arch",
            ],
            "//build/bazel/platforms/os:linux_bionic": [
                ":libc_headers_arch",
            ],
            "//conditions:default": [],
        }),
    )

Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786

Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-04-02 08:17:34 +00:00
Jaewoong Jung 56e12dbbaf Revert "Revert "Add min_sdk_version to java_import.""
This reverts commit 5ab6508008.

Reason for revert: Resubmitting Ie255f74d40432f4bdd0092d618705a7d17235e58 after fixing the broken targets.

Bug: 183695497
Test: https://android-build.googleplex.com/builds/forrest/run/L58600000849810513
Change-Id: I5f072f396002ca3a45bd530ad9be987efa732833
2021-04-02 04:55:27 +00:00
Julien Desprez 573ad0da9f Merge "Remove tradefed static_lib heuristic" am: cb05715e9e am: d27a7fad3f am: 2781607d08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638101

Change-Id: I0b9f9615c0b3fd09c493728883d1b29ab8c8bafd
2021-04-02 04:50:38 +00:00
Yi Kong fc31228715 Merge "Move toc.sh to use LLVM binutils" am: 948205699b am: 115fc28122 am: 84c6d3c48d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661823

Change-Id: Ic6df699e0f25b1ce952317b0b8e6520f01cd24bb
2021-04-02 04:50:08 +00:00
Julien Desprez 2781607d08 Merge "Remove tradefed static_lib heuristic" am: cb05715e9e am: d27a7fad3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638101

Change-Id: If068bf2977d8f202b013dbd408ba7192e10c8512
2021-04-02 04:45:45 +00:00
Julien Desprez d27a7fad3f Merge "Remove tradefed static_lib heuristic" am: cb05715e9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638101

Change-Id: I75312967ceead525d02c9171480b8c78e2d41a88
2021-04-02 04:22:25 +00:00
Yi Kong 84c6d3c48d Merge "Move toc.sh to use LLVM binutils" am: 948205699b am: 115fc28122
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661823

Change-Id: I454e268478f86f3bafb80db67ea2699030db3ae8
2021-04-02 04:07:29 +00:00
Julien Desprez cb05715e9e Merge "Remove tradefed static_lib heuristic" 2021-04-02 03:47:13 +00:00
Yi Kong 115fc28122 Merge "Move toc.sh to use LLVM binutils" am: 948205699b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661823

Change-Id: I4a1a0741560a9122e2656cefa8624fd28a07859f
2021-04-02 03:23:57 +00:00
Jaewoong Jung a8eae7b113 Merge "Revert "Add min_sdk_version to java_import."" am: 37a5d5ebd8 am: 7644361eef am: e790b69343
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663080

Change-Id: I8182c3f6caf58c0e96fc81b624ba974df68cc5bf
2021-04-02 02:40:39 +00:00
Yi Kong 948205699b Merge "Move toc.sh to use LLVM binutils" 2021-04-02 02:38:16 +00:00
Jaewoong Jung e790b69343 Merge "Revert "Add min_sdk_version to java_import."" am: 37a5d5ebd8 am: 7644361eef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663080

Change-Id: Id9a2c9d99d367d85ee2409d6f680f00dd567ca1e
2021-04-02 01:53:41 +00:00
Jaewoong Jung 7644361eef Merge "Revert "Add min_sdk_version to java_import."" am: 37a5d5ebd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663080

Change-Id: Ie97a1b3bd0d2bbcd6feb64c3aa9018a431157007
2021-04-02 01:14:07 +00:00
Ryan Prichard 9110bde59d Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: 252831b03a am: a9cf131c22 am: 81d7a5336d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661300

Change-Id: I1cd443d4fb6715458477a130803c4f94e5fbeb40
2021-04-02 00:58:03 +00:00
Jaewoong Jung 37a5d5ebd8 Merge "Revert "Add min_sdk_version to java_import."" 2021-04-02 00:34:06 +00:00
Jaewoong Jung 5ab6508008 Revert "Add min_sdk_version to java_import."
This reverts commit 6d15d63556.

Reason for revert: Broke git_sc-mainline-prod on test_suites_x86_64

Fixes: 184305592
Change-Id: I4b2e2675e0dd9e2e84966f545a52f45d5b731bab
2021-04-02 00:17:59 +00:00
Ryan Prichard 81d7a5336d Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: 252831b03a am: a9cf131c22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661300

Change-Id: Iac78177070c3ae46106b7e12bfa7ebc649d74376
2021-04-02 00:05:52 +00:00
Steven Moreland ba407c8afa Export header check allows WholeStaticLibs
cc/linker.go code assumes that export_static_lib_headers can apply
regardless of whether a library is a regular or 'whole' static lib.
However, this check prevents that code from working.

Bug: 183654927
Test: use export_static_lib_headers like this
Change-Id: I680f90514e41224a7077630167ab4e481909d89c
2021-04-02 00:03:44 +00:00
sophiez 7f7193a782 NDK API coverage
Cherry-pick from aosp: Update OWNERS file under build/soong/scripts to include coverage team as owner of related scripts.

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: I6150d5bda0d59828a985cd2ab5dd0aa38a7987c3
Merged-In: I6150d5bda0d59828a985cd2ab5dd0aa38a7987c3
2021-04-01 23:47:21 +00:00
Ryan Prichard a9cf131c22 Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: 252831b03a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661300

Change-Id: I5b330c63f7ac37ed479cc776d6f642f1419de5b5
2021-04-01 23:19:45 +00:00
Treehugger Robot 2c21009bd4 Merge "bp2build: don't generate a WORKSPACE." am: acabe1b625 am: 2b4fc842c3 am: 3c372f7968
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661819

Change-Id: I449081404647ff56a9f4cd102371d23e33efbec2
2021-04-01 23:02:58 +00:00
Ryan Prichard 252831b03a Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" 2021-04-01 22:42:33 +00:00
Treehugger Robot 3c372f7968 Merge "bp2build: don't generate a WORKSPACE." am: acabe1b625 am: 2b4fc842c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661819

Change-Id: I6bf49ab9898a6f4977034015c9fb465c9651ec30
2021-04-01 22:16:02 +00:00
Jaewoong Jung 2745317d74 Merge "Add min_sdk_version to java_import." am: 51a0d85ebc am: e37f90021f am: f88946c3ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660819

Change-Id: I81345ab4dd0efcc584d978db290361558fc6477c
2021-04-01 21:39:08 +00:00
Treehugger Robot 2b4fc842c3 Merge "bp2build: don't generate a WORKSPACE." am: acabe1b625
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661819

Change-Id: Id8613659c572d8bbdffbd107a5536ed540ca90eb
2021-04-01 21:34:32 +00:00
sophiez 27a26526f0 NDK API coverage
Cherry-pick from aosp: Update the gen_ndk_usedby_apex.sh script to generate NDK API list with
library name.

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only

Change-Id: I799e03ad7d81a4184229f658fd6c8824b9ba6e1f
Merged-In: I799e03ad7d81a4184229f658fd6c8824b9ba6e1f
2021-04-01 21:14:59 +00:00
Treehugger Robot acabe1b625 Merge "bp2build: don't generate a WORKSPACE." 2021-04-01 20:59:01 +00:00
Jaewoong Jung f88946c3ac Merge "Add min_sdk_version to java_import." am: 51a0d85ebc am: e37f90021f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660819

Change-Id: I60383180f51abf45cd68016a5ceef6900b96d5ab
2021-04-01 20:54:23 +00:00
Lukács T. Berki 9b316eaaf0 Merge "Reorganize soong_build/main.go ." am: c5b3a1722c am: ae5bf80c7c am: 764a663c62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662203

Change-Id: I925188b0a52e7fa8aeb3f2ca8438b97e0f13ad05
2021-04-01 20:37:46 +00:00
Paul Duffin d054ae4fb9 Merge "Convert remaining rust tests to use test fixtures" am: e6165d0f46 am: cdc1757b07 am: 7488d8c41e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658074

Change-Id: Iceed93e2acbe38a82868345dfa0d8f3597dcac1a
2021-04-01 20:37:38 +00:00
Jaewoong Jung e37f90021f Merge "Add min_sdk_version to java_import." am: 51a0d85ebc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660819

Change-Id: I3910928b88293464faa18d4a6c1a0b1e6d1871a9
2021-04-01 20:12:41 +00:00
Lukács T. Berki 764a663c62 Merge "Reorganize soong_build/main.go ." am: c5b3a1722c am: ae5bf80c7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662203

Change-Id: I03a8caeedba41310fd156e15c4037ae539cf1ec9
2021-04-01 19:51:25 +00:00
Paul Duffin 7488d8c41e Merge "Convert remaining rust tests to use test fixtures" am: e6165d0f46 am: cdc1757b07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658074

Change-Id: Ibfb0e8c37e920f41a2bdcb6603fd2cb93b9bef06
2021-04-01 19:51:16 +00:00
Jaewoong Jung 51a0d85ebc Merge "Add min_sdk_version to java_import." 2021-04-01 19:45:53 +00:00
Lukács T. Berki ae5bf80c7c Merge "Reorganize soong_build/main.go ." am: c5b3a1722c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662203

Change-Id: I822eed4dbe069298e929114ef0f37b4c0ca459f6
2021-04-01 19:13:21 +00:00
Paul Duffin cdc1757b07 Merge "Convert remaining rust tests to use test fixtures" am: e6165d0f46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658074

Change-Id: Iee307b1ed305c2c253177303a83da5adef64e54f
2021-04-01 19:07:51 +00:00
Lukács T. Berki c5b3a1722c Merge "Reorganize soong_build/main.go ." 2021-04-01 19:05:31 +00:00
Paul Duffin e6165d0f46 Merge "Convert remaining rust tests to use test fixtures" 2021-04-01 18:13:23 +00:00
Paul Duffin 6909eacb78 Merge changes Idc01d3cc,I644db99c am: 379f36b6e5 am: 35bc45ceb4 am: 64b3d2adbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660144

Change-Id: I8b9120016d52200d6f9c7f1d3d92c84e02cdf5ee
2021-04-01 16:30:27 +00:00
Nikita Ioffe eac680eeb4 Merge "Revert "Allow dependencies from platform variants to APEX modules."" am: 6f77314381 am: 72d1c2f38e am: e7e0954fea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660243

Change-Id: Ibfd60afe26a0b931803c9b84f8805b5ebc54483b
2021-04-01 16:28:59 +00:00