From f192d553823e765b2db39162f11f72d69ba51fd9 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Tue, 17 Dec 2019 13:56:13 -0800 Subject: [PATCH] Declare manifest as input to test config fixer. It needs to be an implicit input for it to work consistently. Test: m GooglePermissionControllerUnitTests Bug: 145011263 Change-Id: Ib71d768e750faa5b577652e79a18d05929bde52f --- java/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app.go b/java/app.go index aa9c78c0f..14850aeab 100755 --- a/java/app.go +++ b/java/app.go @@ -646,7 +646,7 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { fixedConfig := android.PathForModuleOut(ctx, "test_config_fixer", "AndroidTest.xml") rule := android.NewRuleBuilder() rule.Command().BuiltTool(ctx, "test_config_fixer"). - FlagWithArg("--manifest ", a.manifestPath.String()). + FlagWithInput("--manifest ", a.manifestPath). FlagWithArg("--package-name ", *a.overridableAppProperties.Package_name). Input(a.testConfig). Output(fixedConfig)