From fb8bc951998b5200932666d812edbe3f38b5a976 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 22 Mar 2021 17:31:52 +0000 Subject: [PATCH] Remove uses of buildDir from java/app_import_test.go Remove any uses, either direct (or indirect via testJavaConfig or similar methods), of the package level buildDir variable from this file. Bug: 182885307 Test: m nothing Change-Id: I700a3cafaa427243212aab1eb903d1871327483c --- java/app_import_test.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/java/app_import_test.go b/java/app_import_test.go index cae41d0e7..147ae45bb 100644 --- a/java/app_import_test.go +++ b/java/app_import_test.go @@ -252,14 +252,15 @@ func TestAndroidAppImport_DpiVariants(t *testing.T) { jniRuleRe := regexp.MustCompile("^if \\(zipinfo (\\S+)") for _, test := range testCases { - config := testAppConfig(nil, bp, nil) - config.TestProductVariables.AAPTPreferredConfig = test.aaptPreferredConfig - config.TestProductVariables.AAPTPrebuiltDPI = test.aaptPrebuiltDPI - ctx := testContext(config) + result := android.GroupFixturePreparers( + PrepareForTestWithJavaDefaultModules, + android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { + variables.AAPTPreferredConfig = test.aaptPreferredConfig + variables.AAPTPrebuiltDPI = test.aaptPrebuiltDPI + }), + ).RunTestWithBp(t, bp) - run(t, ctx, config) - - variant := ctx.ModuleForTests("foo", "android_common") + variant := result.ModuleForTests("foo", "android_common") jniRuleCommand := variant.Output("jnis-uncompressed/foo.apk").RuleParams.Command matches := jniRuleRe.FindStringSubmatch(jniRuleCommand) if len(matches) != 2 { @@ -456,12 +457,9 @@ func TestAndroidAppImport_frameworkRes(t *testing.T) { t.Errorf("prebuilt framework-res is not preprocessed") } - expectedInstallPath := buildDir + "/target/product/test_device/system/framework/framework-res.apk" + expectedInstallPath := "out/soong/target/product/test_device/system/framework/framework-res.apk" - if a.dexpreopter.installPath.String() != expectedInstallPath { - t.Errorf("prebuilt framework-res installed to incorrect location, actual: %s, expected: %s", a.dexpreopter.installPath, expectedInstallPath) - - } + android.AssertPathRelativeToTopEquals(t, "prebuilt framework-res install location", expectedInstallPath, a.dexpreopter.installPath) entries := android.AndroidMkEntriesForTest(t, ctx, mod)[0]