Include __BIONIC_NO_PAGE_SIZE_MACRO flag to avoid breaking libraries
The __BIONIC_NO_PAGE_SIZE_MACRO flag has to be passed to
the build system because there are C/C++ libraries using
__BIONIC_NO_PAGE_SIZE_MACRO to decide whether to use getpagesize()
or PAGE_SIZE macro.
Bug: 333973679
Test: Build manually
Change-Id: Ie5d71f4b2b256ab8f429ed4724b8d249b364d5da
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index 380f20a..beb68e1 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -101,7 +101,9 @@
pctx.VariableFunc("Arm64Cflags", func(ctx android.PackageVarContext) string {
flags := arm64Cflags
- if !ctx.Config().NoBionicPageSizeMacro() {
+ if ctx.Config().NoBionicPageSizeMacro() {
+ flags = append(flags, "-D__BIONIC_NO_PAGE_SIZE_MACRO")
+ } else {
flags = append(flags, "-D__BIONIC_DEPRECATED_PAGE_SIZE_MACRO")
}
return strings.Join(flags, " ")
diff --git a/cc/config/x86_64_device.go b/cc/config/x86_64_device.go
index f88358a..5aa2a7e 100644
--- a/cc/config/x86_64_device.go
+++ b/cc/config/x86_64_device.go
@@ -110,7 +110,9 @@
// Clang cflags
pctx.VariableFunc("X86_64Cflags", func(ctx android.PackageVarContext) string {
flags := x86_64Cflags
- if !ctx.Config().NoBionicPageSizeMacro() {
+ if ctx.Config().NoBionicPageSizeMacro() {
+ flags = append(flags, "-D__BIONIC_NO_PAGE_SIZE_MACRO")
+ } else {
flags = append(flags, "-D__BIONIC_DEPRECATED_PAGE_SIZE_MACRO")
}
return strings.Join(flags, " ")