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

Commit cef22354 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge changes I0c80b546,Ibc673303,I70317eb8 into sc-dev am: 55d7ed4b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14663619

Change-Id: Ice4a76644969bc8e0c9e9ef5802fd8995944051a
parents 2036d8c3 55d7ed4b

java/dexpreopt_test.go

+5 −0
Original line number Diff line number Diff line
@@ -173,6 +173,11 @@ func enabledString(enabled bool) string { 
}



func TestDex2oatToolDeps(t *testing.T) {

	if android.BuildOs != android.Linux {

		// The host binary paths checked below are build OS dependent.

		t.Skipf("Unsupported build OS %s", android.BuildOs)

	}



	preparers := android.GroupFixturePreparers(

		cc.PrepareForTestWithCcDefaultModules,

		PrepareForTestWithJavaDefaultModulesWithoutFakeDex2oatd,