commit 52af5b052bcf1d0f2cec2a58a0e5f6fd5f435dea
author Matthew Maurer <mmaurer@google.com> Thu May 27 10:01:36 2021 -0700
committer Matthew Maurer <mmaurer@google.com> Tue Aug 17 15:08:49 2021 -0700
tree 20ee17e83ce5ad3345277d91a5b7daf599228fc1
parent 460ee9429edf27dbac2d308ecc18354c8df9ab73

Support Rust in Product

Bug: 178565008
Bug: 165791368
Test: Build and link a Rust library into a product binary
Change-Id: I9c5aa5f3a1f323af9aa2aee804635045f1b91bd4

cc/androidmk.go

diff --git a/cc/androidmk.go b/cc/androidmk.go
index df3776c..1f08a01 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -25,7 +25,7 @@
 
 var (
 	nativeBridgeSuffix  = ".native_bridge"
-	productSuffix       = ".product"
+	ProductSuffix       = ".product"
 	VendorSuffix        = ".vendor"
 	ramdiskSuffix       = ".ramdisk"
 	VendorRamdiskSuffix = ".vendor_ramdisk"

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 0d2ef4e..03280f4 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1632,7 +1632,7 @@
 			return ""
 		}
 		vndkVersion = ctx.DeviceConfig().ProductVndkVersion()
-		nameSuffix = productSuffix
+		nameSuffix = ProductSuffix
 	} else {
 		vndkVersion = ctx.DeviceConfig().VndkVersion()
 		nameSuffix = VendorSuffix