diff --git a/cc/androidmk.go b/cc/androidmk.go
index 4862157..e95d5a7 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -27,7 +27,7 @@
 	NativeBridgeSuffix  = ".native_bridge"
 	ProductSuffix       = ".product"
 	VendorSuffix        = ".vendor"
-	ramdiskSuffix       = ".ramdisk"
+	RamdiskSuffix       = ".ramdisk"
 	VendorRamdiskSuffix = ".vendor_ramdisk"
 	RecoverySuffix      = ".recovery"
 	sdkSuffix           = ".sdk"
diff --git a/cc/cc.go b/cc/cc.go
index be4b798..2006ecf 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1668,7 +1668,7 @@
 		// such suffixes are already hard-coded in prebuilts/vndk/.../Android.bp.
 		c.Properties.SubName += VendorSuffix
 	} else if c.InRamdisk() && !c.OnlyInRamdisk() {
-		c.Properties.SubName += ramdiskSuffix
+		c.Properties.SubName += RamdiskSuffix
 	} else if c.InVendorRamdisk() && !c.OnlyInVendorRamdisk() {
 		c.Properties.SubName += VendorRamdiskSuffix
 	} else if c.InRecovery() && !c.OnlyInRecovery() {
@@ -3029,7 +3029,7 @@
 		// core module, so update the dependency name here accordingly.
 		return libName + ccDep.SubName()
 	} else if ccDep.InRamdisk() && !ccDep.OnlyInRamdisk() {
-		return libName + ramdiskSuffix
+		return libName + RamdiskSuffix
 	} else if ccDep.InVendorRamdisk() && !ccDep.OnlyInVendorRamdisk() {
 		return libName + VendorRamdiskSuffix
 	} else if ccDep.InRecovery() && !ccDep.OnlyInRecovery() {
