StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove uses of buildDir from java/app_import_test.go"

Browse Source
This commit is contained in:
Paul Duffin
2021-03-24 07:55:37 +00:00
committed by Gerrit Code Review
parent 6f59e6a568 fb8bc95199
commit 6567d07f59
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/app_import_test.go
View File

@@ -252,14 +252,15 @@ func TestAndroidAppImport_DpiVariants(t *testing.T) {
jniRuleRe := regexp.MustCompile("^if \\(zipinfo (\\S+)") jniRuleRe := regexp.MustCompile("^if \\(zipinfo (\\S+)")
for _, test := range testCases { for _, test := range testCases {
config := testAppConfig(nil, bp, nil) result := android.GroupFixturePreparers(
config.TestProductVariables.AAPTPreferredConfig = test.aaptPreferredConfig PrepareForTestWithJavaDefaultModules,
config.TestProductVariables.AAPTPrebuiltDPI = test.aaptPrebuiltDPI android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
ctx := testContext(config) variables.AAPTPreferredConfig = test.aaptPreferredConfig
variables.AAPTPrebuiltDPI = test.aaptPrebuiltDPI
}),
).RunTestWithBp(t, bp)
run(t, ctx, config) variant := result.ModuleForTests("foo", "android_common")
variant := ctx.ModuleForTests("foo", "android_common")
jniRuleCommand := variant.Output("jnis-uncompressed/foo.apk").RuleParams.Command jniRuleCommand := variant.Output("jnis-uncompressed/foo.apk").RuleParams.Command
matches := jniRuleRe.FindStringSubmatch(jniRuleCommand) matches := jniRuleRe.FindStringSubmatch(jniRuleCommand)
if len(matches) != 2 { if len(matches) != 2 {
@@ -456,12 +457,9 @@ func TestAndroidAppImport_frameworkRes(t *testing.T) {
t.Errorf("prebuilt framework-res is not preprocessed") 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 { android.AssertPathRelativeToTopEquals(t, "prebuilt framework-res install location", expectedInstallPath, a.dexpreopter.installPath)
t.Errorf("prebuilt framework-res installed to incorrect location, actual: %s, expected: %s", a.dexpreopter.installPath, expectedInstallPath)
}
entries := android.AndroidMkEntriesForTest(t, ctx, mod)[0] entries := android.AndroidMkEntriesForTest(t, ctx, mod)[0]