From 8fa6acf0026fd480ada76b540dea7c529602b574 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Thu, 5 Mar 2020 14:09:58 +0000
Subject: [PATCH] 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 | 7 +++++++
 sdk/cc_sdk_test.go       | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/cc/library_sdk_member.go b/cc/library_sdk_member.go
index 16b9e6f83..a26269772 100644
--- a/cc/library_sdk_member.go
+++ b/cc/library_sdk_member.go
@@ -97,6 +97,13 @@ func (mt *librarySdkMemberType) IsInstance(module android.Module) bool {
 
 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
 }
 
diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go
index a14890ef2..5366edfb5 100644
--- a/sdk/cc_sdk_test.go
+++ b/sdk/cc_sdk_test.go
@@ -517,6 +517,7 @@ func TestHostSnapshotWithCcSharedLibrary(t *testing.T) {
 			},
 			system_shared_libs: [],
 			stl: "none",
+			sdk_version: "minimum",
 		}
 	`)
 
@@ -529,6 +530,7 @@ cc_prebuilt_library_shared {
     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 @@ cc_prebuilt_library_shared {
     prefer: false,
     device_supported: false,
     host_supported: true,
+    sdk_version: "minimum",
     export_include_dirs: ["include/include"],
     arch: {
         x86_64: {