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 { diff --git a/sdk/sdk.go b/sdk/sdk.go index c2685055f..3e760080e 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -218,7 +218,7 @@ func newSdkModule(moduleExports bool) *sdk { Compile_multilib *string } p := &props{Compile_multilib: proptools.StringPtr("both")} - ctx.AppendProperties(p) + ctx.PrependProperties(p) }) return s }