diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 13 | ||||
| -rw-r--r-- | java/java.go | 18 |
2 files changed, 9 insertions, 22 deletions
diff --git a/java/app.go b/java/app.go index 5f4332650..e01a2ba7b 100644 --- a/java/app.go +++ b/java/app.go @@ -1442,9 +1442,8 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_common_data)...) a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_data)...) a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_prefer32_data)...) - android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{ - TestcaseRelDataFiles: testcaseRel(a.data), + InstalledFiles: a.data, OutputFile: a.OutputFile(), TestConfig: a.testConfig, HostRequiredModuleNames: a.HostRequiredModuleNames(), @@ -1452,8 +1451,6 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { IsHost: false, LocalCertificate: a.certificate.AndroidMkString(), IsUnitTest: Bool(a.testProperties.Test_options.Unit_test), - MkInclude: "$(BUILD_SYSTEM)/soong_app_prebuilt.mk", - MkAppClass: "APPS", }) android.SetProvider(ctx, android.TestOnlyProviderKey, android.TestModuleInformation{ TestOnly: true, @@ -1462,14 +1459,6 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { } -func testcaseRel(paths android.Paths) []string { - relPaths := []string{} - for _, p := range paths { - relPaths = append(relPaths, p.Rel()) - } - return relPaths -} - func (a *AndroidTest) FixTestConfig(ctx android.ModuleContext, testConfig android.Path) android.Path { if testConfig == nil { return nil diff --git a/java/java.go b/java/java.go index fff902fa1..53b3481d0 100644 --- a/java/java.go +++ b/java/java.go @@ -1559,16 +1559,14 @@ func (j *TestHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.Test.generateAndroidBuildActionsWithConfig(ctx, configs) android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{ - TestcaseRelDataFiles: testcaseRel(j.data), - OutputFile: j.outputFile, - TestConfig: j.testConfig, - RequiredModuleNames: j.RequiredModuleNames(ctx), - TestSuites: j.testProperties.Test_suites, - IsHost: true, - LocalSdkVersion: j.sdkVersion.String(), - IsUnitTest: Bool(j.testProperties.Test_options.Unit_test), - MkInclude: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk", - MkAppClass: "JAVA_LIBRARIES", + InstalledFiles: j.data, + OutputFile: j.outputFile, + TestConfig: j.testConfig, + RequiredModuleNames: j.RequiredModuleNames(ctx), + TestSuites: j.testProperties.Test_suites, + IsHost: true, + LocalSdkVersion: j.sdkVersion.String(), + IsUnitTest: Bool(j.testProperties.Test_options.Unit_test), }) } |