Bionic libc_headers shouldn't be used in non-Bionic host builds.
With upcoming SDK snapshot generation fixes it won't be enabled for
linux_glibc either.
Test: art/build/apex/runtests.sh on master-art
Test: art/tools/buildbot-build.sh {--host,--target} on master-art
Bug: 151303681
Change-Id: I9379d47dd266c7737fc9e30db67f833c63044965
diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp
index d6c7663..34813cd 100644
--- a/tools/cpp-define-generator/Android.bp
+++ b/tools/cpp-define-generator/Android.bp
@@ -27,9 +27,16 @@
"art_libartbase_headers", // For base/bit_utils.h
"jni_headers",
"libart_runtime_headers_ndk",
- "libc_headers", // TODO(b/153662223): Clean this up.
"libdexfile_all_headers", // For dex/modifiers.h
],
+ target: {
+ android: {
+ header_libs: ["libc_headers"], // TODO(b/153662223): Clean this up.
+ },
+ linux_bionic: {
+ header_libs: ["libc_headers"], // TODO(b/153662223): Clean this up.
+ },
+ },
// Produce text file rather than binary.
cflags: ["-S"],
srcs: ["asm_defines.cc"],