diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-03 09:00:35 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-03 09:00:35 +0000 |
| commit | f1b93a610dd9b862d6a34a9e74232685c513abd0 (patch) | |
| tree | d3c4c7e879b4c77ee7b433612aa646f5f2c24192 | |
| parent | d909af4f02deccafa1f338c888f5ee882e893000 (diff) | |
| parent | d5c4e4df50c9bcde43da39896a043b299b9e9f79 (diff) | |
| download | bazel-f1b93a610dd9b862d6a34a9e74232685c513abd0.tar.gz | |
Snap for 8400509 from d5c4e4df50c9bcde43da39896a043b299b9e9f79 to main-cg-testing-release
Change-Id: Ie22c2179ddd7b26ca515ebb33404f7da9bb00c82
| -rw-r--r-- | bazel.WORKSPACE | 3 | ||||
| -rw-r--r-- | examples/soong_config_variables/Android.bp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bazel.WORKSPACE b/bazel.WORKSPACE index 57d8fea5..4b889d10 100644 --- a/bazel.WORKSPACE +++ b/bazel.WORKSPACE @@ -2,7 +2,8 @@ load("//build/bazel/rules:soong_injection.bzl", "soong_injection_repository") load("//build/bazel/rules:make_injection.bzl", "make_injection_repository") register_toolchains( - "//prebuilts/clang/host/linux-x86:all" + "//prebuilts/build-tools:py_toolchain", + "//prebuilts/clang/host/linux-x86:all", ) # This repository provides files that Soong emits during bp2build (other than diff --git a/examples/soong_config_variables/Android.bp b/examples/soong_config_variables/Android.bp index 3faf7577..8994f28e 100644 --- a/examples/soong_config_variables/Android.bp +++ b/examples/soong_config_variables/Android.bp @@ -81,6 +81,9 @@ fake_library_linking_strategy_cc_defaults { linux_glibc: { enabled: false, }, + linux_musl: { + enabled: false, + }, linux_bionic: { enabled: false, }, |