commit 6a3b60969e1c24aa1f59d21efe06b3feb42dc533
author David Anderson <dvander@google.com> Fri Feb 18 23:59:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 18 23:59:11 2022 +0000
tree ab39d1ef04ac97fddd9a9a1781f9f5c3a81eb813
parent 8d0b528a3c1f9989c84aa584964bdb009353bf4f
parent 7309742728063ebea25eff41df6ce0483fbe7f84

Merge "Add an __ANDROID_RAMDISK__ preprocessor define." am: 7309742728

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

Change-Id: Ie5bde3262b38612c1a3c9bfac8a8e366a416de38

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() {