From c57947860d252aa735c50785d4f6ff1c77054ca2 Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Wed, 10 Mar 2021 03:24:48 -0500 Subject: [PATCH] bp2build: remove some bp2build_available props, use package_allowlist instead. Test: build/bazel/scripts/milestone-2/demo.sh full Test: bazel query //bionic/... Change-Id: I737574766be898279d8bf6f3f0adb43dcc40c220 --- benchmarks/linker_relocation/Android.bp | 1 - libc/async_safe/Android.bp | 1 - libc/tools/Android.bp | 1 - linker/Android.bp | 3 +++ tools/Android.bp | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/benchmarks/linker_relocation/Android.bp b/benchmarks/linker_relocation/Android.bp index b41d0933e..b78eb8edb 100644 --- a/benchmarks/linker_relocation/Android.bp +++ b/benchmarks/linker_relocation/Android.bp @@ -32,7 +32,6 @@ cc_library_headers { name: "linker_reloc_bench_headers", defaults: ["bionic_spawn_benchmark_targets"], export_include_dirs: ["include"], - bazel_module: { bp2build_available: true }, } // TODO: This benchmark doesn't work with TradeFed/atest because it doesn't copy its test libraries diff --git a/libc/async_safe/Android.bp b/libc/async_safe/Android.bp index 2e05d7afb..e4a583774 100644 --- a/libc/async_safe/Android.bp +++ b/libc/async_safe/Android.bp @@ -57,5 +57,4 @@ cc_library_headers { "//apex_available:platform", "com.android.runtime", ], - bazel_module: { bp2build_available: true }, } diff --git a/libc/tools/Android.bp b/libc/tools/Android.bp index 575a31a9a..116b853d5 100644 --- a/libc/tools/Android.bp +++ b/libc/tools/Android.bp @@ -11,7 +11,6 @@ package { filegroup { name: "bionic-gensyscalls", srcs: ["gensyscalls.py"], - bazel_module: { bp2build_available: true }, } // Generate the C++ policy sources for app and system seccomp-bpf filters. diff --git a/linker/Android.bp b/linker/Android.bp index dd376da86..3370f2826 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -68,6 +68,9 @@ cc_object { // We need to access Bionic private headers in the linker. include_dirs: ["bionic/libc"], + + // b/182338959 + bazel_module: { bp2build_available: false }, } // ======================================================== diff --git a/tools/Android.bp b/tools/Android.bp index 5a54fe451..dcd2a7d84 100644 --- a/tools/Android.bp +++ b/tools/Android.bp @@ -18,5 +18,4 @@ subdirs = ["*"] filegroup { name: "bionic-generate-version-script", srcs: ["generate-version-script.py"], - bazel_module: { bp2build_available: true }, }