Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26ab8e80 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Prepend default to allow overriding in the bp file. 

Bug: 143948100
Bug: 151303681
Test: m nothing
Change-Id: Iefcf4fbe9d2971ce267242185165f0c38f68db30
parent cc77601d

sdk/cc_sdk_test.go

+22 −0
Original line number Diff line number Diff line
@@ -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 {

sdk/sdk.go

+1 −1
Original line number Diff line number Diff line
@@ -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

}