Move brillo closer to Android.
Hiding our legacy cruft seemed like a good idea, but in practice it will only
mean worse interoperability.
Plus we got it wrong, as the recent `putw` example showed.
Change-Id: I167c7168eff133889028089c22a7a0dfb8d6d0cf
diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index 53efef0..c042f9f 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -50,8 +50,8 @@
extern "C" {
-// Brillo and LP64 don't need to support any legacy cruft.
-#if !defined(__BRILLO__) && !defined(__LP64__)
+// LP64 doesn't need to support any legacy cruft.
+#if !defined(__LP64__)
// These were accidentally declared in <unistd.h> because we stupidly used to inline
// getpagesize() and __getpageshift(). Needed for backwards compatibility with old NDK apps.
@@ -375,14 +375,11 @@
return 0;
}
-#endif // !defined(__BRILLO__) && !defined (__LP64__)
-
-#if !defined(__LP64__)
// LP32's <stdio.h> had putw (but not getw).
-// TODO: does brillo intentionally include this, or is there a missing `nobrillo`?
int putw(int value, FILE* fp) {
return fwrite(&value, sizeof(value), 1, fp) == 1 ? 0 : EOF;
}
-#endif
+
+#endif // !defined (__LP64__)
} // extern "C"