commit 8fa6acf0026fd480ada76b540dea7c529602b574
author Paul Duffin <paulduffin@google.com> Thu Mar 05 14:09:58 2020 +0000
committer Paul Duffin <paulduffin@google.com> Wed Apr 22 12:51:34 2020 +0100
tree e2a69ea60f4142ac47fcc3dbff46f6a6aa0916ed
parent d76209b690540d1a5f626ad329db09874375d89a

Copy sdk_version to cc library snapshots

Bug: 142935992
Bug: 153306490
Test: m nothing
Merged-In: Ib77c548b1971c841749c87115108af8b092bb809
Change-Id: Ib77c548b1971c841749c87115108af8b092bb809

cc/library_sdk_member.go

diff --git a/cc/library_sdk_member.go b/cc/library_sdk_member.go
index 16b9e6f..a262697 100644
--- a/cc/library_sdk_member.go
+++ b/cc/library_sdk_member.go
@@ -97,6 +97,13 @@
 
 func (mt *librarySdkMemberType) AddPrebuiltModule(sdkModuleContext android.ModuleContext, builder android.SnapshotBuilder, member android.SdkMember) android.BpModule {
 	pbm := builder.AddPrebuiltModule(member, mt.prebuiltModuleType)
+
+	ccModule := member.Variants()[0].(*Module)
+
+	sdkVersion := ccModule.SdkVersion()
+	if sdkVersion != "" {
+		pbm.AddProperty("sdk_version", sdkVersion)
+	}
 	return pbm
 }
 

sdk/cc_sdk_test.go

diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go
index a14890e..5366edf 100644
--- a/sdk/cc_sdk_test.go
+++ b/sdk/cc_sdk_test.go
@@ -517,6 +517,7 @@
 			},
 			system_shared_libs: [],
 			stl: "none",
+			sdk_version: "minimum",
 		}
 	`)
 
@@ -529,6 +530,7 @@
     sdk_member_name: "mynativelib",
     device_supported: false,
     host_supported: true,
+    sdk_version: "minimum",
     export_include_dirs: ["include/include"],
     arch: {
         x86_64: {
@@ -549,6 +551,7 @@
     prefer: false,
     device_supported: false,
     host_supported: true,
+    sdk_version: "minimum",
     export_include_dirs: ["include/include"],
     arch: {
         x86_64: {