From 26ab8e80e49640943fb06e1e62a9c1964b2debf6 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Tue, 30 Jun 2020 20:34:00 +0100 Subject: Prepend default to allow overriding in the bp file. Bug: 143948100 Bug: 151303681 Test: m nothing Change-Id: Iefcf4fbe9d2971ce267242185165f0c38f68db30 --- sdk/cc_sdk_test.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'sdk/cc_sdk_test.go') diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go index 7db56c4c7..c59cd3095 100644 --- a/sdk/cc_sdk_test.go +++ b/sdk/cc_sdk_test.go @@ -69,6 +69,28 @@ func TestSdkIsCompileMultilibBoth(t *testing.T) { ensureListContains(t, inputs, arm64Output.String()) } +func TestSdkCompileMultilibOverride(t *testing.T) { + result := testSdkWithCc(t, ` + sdk { + name: "mysdk", + native_shared_libs: ["sdkmember"], + compile_multilib: "64", + } + + cc_library_shared { + name: "sdkmember", + srcs: ["Test.cpp"], + stl: "none", + compile_multilib: "64", + } + `) + + result.CheckSnapshot("mysdk", "", + checkAllCopyRules(` +.intermediates/sdkmember/android_arm64_armv8-a_shared/sdkmember.so -> arm64/lib/sdkmember.so +`)) +} + func TestBasicSdkWithCc(t *testing.T) { result := testSdkWithCc(t, ` sdk { -- cgit v1.2.3-59-g8ed1b