Merge "Use __BIONIC_DEPRECATED_PAGE_SIZE_MACRO." into main am: 8d1b2db53f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3031204

Change-Id: I45c54567d952b5051dcda99fe860193cf4991125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2024-04-10 21:05:38 +00:00
committed by Automerger Merge Worker
2 changed files with 4 additions and 4 deletions

View File

@@ -101,8 +101,8 @@ func init() {
pctx.VariableFunc("Arm64Cflags", func(ctx android.PackageVarContext) string {
flags := arm64Cflags
if ctx.Config().NoBionicPageSizeMacro() {
flags = append(flags, "-D__BIONIC_NO_PAGE_SIZE_MACRO")
if !ctx.Config().NoBionicPageSizeMacro() {
flags = append(flags, "-D__BIONIC_DEPRECATED_PAGE_SIZE_MACRO")
}
return strings.Join(flags, " ")
})

View File

@@ -110,8 +110,8 @@ func init() {
// Clang cflags
pctx.VariableFunc("X86_64Cflags", func(ctx android.PackageVarContext) string {
flags := x86_64Cflags
if ctx.Config().NoBionicPageSizeMacro() {
flags = append(flags, "-D__BIONIC_NO_PAGE_SIZE_MACRO")
if !ctx.Config().NoBionicPageSizeMacro() {
flags = append(flags, "-D__BIONIC_DEPRECATED_PAGE_SIZE_MACRO")
}
return strings.Join(flags, " ")
})