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

Commit b267e126 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Verify the prebuilt_apex selects the correct input apex file" am: 9b41efab 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I422ccc35977e0be846bb7a3497a50c2fc2c42e92
parents 6f342644 9b41efab

apex/apex_test.go

+7 −0
Original line number Diff line number Diff line
@@ -4384,6 +4384,13 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { 
			t.Errorf("expected: %q, found: %q", expected, actual)

		}



		// Make sure that the prebuilt_apex has the correct input APEX.

		prebuiltApex := ctx.ModuleForTests("myapex", "android_common")

		rule = prebuiltApex.Rule("android/soong/android.Cp")

		if expected, actual := "myapex-arm64.apex", android.NormalizePathForTesting(rule.Input); !reflect.DeepEqual(expected, actual) {

			t.Errorf("expected: %q, found: %q", expected, actual)

		}



		checkDexJarBuildPath(t, ctx, "libfoo")



		checkDexJarBuildPath(t, ctx, "libbar")