diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 2 | ||||
| -rw-r--r-- | java/app_import.go | 18 | ||||
| -rw-r--r-- | java/droidstubs.go | 12 |
3 files changed, 30 insertions, 2 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index f069e7590..430536039 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -552,8 +552,6 @@ func (dstubs *Droidstubs) AndroidMkEntries() []android.AndroidMkEntries { func(w io.Writer, name, prefix, moduleDir string) { if dstubs.apiLintTimestamp != nil { if dstubs.apiLintReport != nil { - fmt.Fprintf(w, "$(call dist-for-goals,%s,%s:%s)\n", dstubs.Name()+"-api-lint", - dstubs.apiLintReport.String(), "apilint/"+dstubs.Name()+"-lint-report.txt") fmt.Fprintf(w, "$(call declare-0p-target,%s)\n", dstubs.apiLintReport.String()) } } diff --git a/java/app_import.go b/java/app_import.go index 352e995e2..dc1aa740f 100644 --- a/java/app_import.go +++ b/java/app_import.go @@ -772,9 +772,27 @@ type AndroidTestImport struct { func (a *AndroidTestImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.generateAndroidBuildActions(ctx) + a.updateModuleInfoJSON(ctx) + a.data = android.PathsForModuleSrc(ctx, a.testProperties.Data) } +func (a *AndroidTestImport) updateModuleInfoJSON(ctx android.ModuleContext) { + moduleInfoJSON := ctx.ModuleInfoJSON() + moduleInfoJSON.Class = []string{"APPS"} + moduleInfoJSON.CompatibilitySuites = []string{"null-suite"} + if len(a.testProperties.Test_suites) > 0 { + moduleInfoJSON.CompatibilitySuites = a.testProperties.Test_suites + } + moduleInfoJSON.SystemSharedLibs = []string{"none"} + moduleInfoJSON.Tags = []string{"tests"} + moduleInfoJSON.RegisterNameOverride = a.BaseModuleName() + testConfig := android.ExistentPathForSource(ctx, ctx.ModuleDir(), "AndroidTest.xml") + if testConfig.Valid() { + moduleInfoJSON.TestConfig = []string{testConfig.String()} + } +} + func (a *AndroidTestImport) InstallInTestcases() bool { return true } diff --git a/java/droidstubs.go b/java/droidstubs.go index 22f4d981d..c8f798a9b 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -1524,6 +1524,18 @@ var ( } ) +func (d *Droidstubs) MakeVars(ctx android.MakeVarsModuleContext) { + if d.apiLintTimestamp != nil { + if d.apiLintReport != nil { + ctx.DistForGoalsWithFilename( + []string{fmt.Sprintf("%s-api-lint", d.Name()), "droidcore"}, + d.apiLintReport, + fmt.Sprintf("apilint/%s-lint-report.txt", d.Name()), + ) + } + } +} + func StubsDefaultsFactory() android.Module { module := &DocDefaults{} |