commit fd9c8762b73c0ace76adf68a55bd3412d1a94b5b
author David Anderson <dvander@google.com> Sat Feb 19 01:17:56 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 19 01:17:56 2022 +0000
tree 31a1c84293a62ebf4af1b483ee27a4401a942e68
parent b257dcb822dfdd3dd2b9fcfd3e380040c6ee4a41
parent a480cc78efea33033fca6d0f60111a34356f979d

Merge "Add an __ANDROID_RAMDISK__ preprocessor define." am: 7309742728 am: 6a3b60969e am: 13f34bef8d am: a480cc78ef

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

Change-Id: If7bc2437ff79ab12289a0b4466cf2a9194f265f4

cc/compiler.go

diff --git a/cc/compiler.go b/cc/compiler.go
index 7645cbb..eb5458f 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -406,6 +406,10 @@
 		flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_RECOVERY__")
 	}
 
+	if ctx.inRecovery() || ctx.inRamdisk() || ctx.inVendorRamdisk() {
+		flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_RAMDISK__")
+	}
+
 	if ctx.apexVariationName() != "" {
 		flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_APEX__")
 		if ctx.Device() {