From 100f3fd118b60a816f9ccc5477ad4372c469fafc Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Wed, 6 Nov 2019 16:03:32 +0900
Subject: sdk modules are by default compile_multilib: "both"

Bug: 143948100
Test: m (sdk_test.go amended)
Change-Id: I7df1b96af49a6569012e44eeb3c0722fac63fa51
---
 sdk/sdk_test.go | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'sdk/sdk_test.go')

diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go
index 664bb7c98..96129b838 100644
--- a/sdk/sdk_test.go
+++ b/sdk/sdk_test.go
@@ -377,6 +377,35 @@ func TestDepNotInRequiredSdks(t *testing.T) {
 	`)
 }
 
+func TestSdkIsCompileMultilibBoth(t *testing.T) {
+	ctx, _ := testSdk(t, `
+		sdk {
+			name: "mysdk",
+			native_shared_libs: ["sdkmember"],
+		}
+
+		cc_library_shared {
+			name: "sdkmember",
+			srcs: ["Test.cpp"],
+			system_shared_libs: [],
+			stl: "none",
+		}
+	`)
+
+	armOutput := ctx.ModuleForTests("sdkmember", "android_arm_armv7-a-neon_core_shared").Module().(*cc.Module).OutputFile()
+	arm64Output := ctx.ModuleForTests("sdkmember", "android_arm64_armv8-a_core_shared").Module().(*cc.Module).OutputFile()
+
+	var inputs []string
+	buildParams := ctx.ModuleForTests("mysdk", "android_common").Module().BuildParamsForTests()
+	for _, bp := range buildParams {
+		inputs = append(inputs, bp.Implicits.Strings()...)
+	}
+
+	// ensure that both 32/64 outputs are inputs of the sdk snapshot
+	ensureListContains(t, inputs, armOutput.String())
+	ensureListContains(t, inputs, arm64Output.String())
+}
+
 var buildDir string
 
 func setUp() {
-- 
cgit v1.2.3-59-g8ed1b