diff options
| author | 2025-03-12 16:02:38 -0700 | |
|---|---|---|
| committer | 2025-03-12 16:02:38 -0700 | |
| commit | 62827203feb45d9b1d264a1b3727b179e04122d4 (patch) | |
| tree | 894dc55a64d65c72c4c144a66fd6a0f105244a92 /java/java.go | |
| parent | 3424918ea1e3693a36871cb293f608014a86b991 (diff) | |
| parent | 8e981549026b5fb1a17d0ad50f8b8ca464a4419d (diff) | |
Snap for 13204655 from 8e981549026b5fb1a17d0ad50f8b8ca464a4419d to 25Q2-release
Change-Id: Ib1ada3ecc630cc189fc83c52bd7de1ea04bbc461
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 235a27d4c..7f897a04f 100644 --- a/java/java.go +++ b/java/java.go @@ -578,6 +578,7 @@ var ( extraLintCheckTag = dependencyTag{name: "extra-lint-check", toolchain: true} jniLibTag = dependencyTag{name: "jnilib", runtimeLinked: true} r8LibraryJarTag = dependencyTag{name: "r8-libraryjar", runtimeLinked: true} + traceReferencesTag = dependencyTag{name: "trace-references"} syspropPublicStubDepTag = dependencyTag{name: "sysprop public stub"} javaApiContributionTag = dependencyTag{name: "java-api-contribution"} aconfigDeclarationTag = dependencyTag{name: "aconfig-declaration"} @@ -608,6 +609,7 @@ var ( kotlinPluginTag, syspropPublicStubDepTag, instrumentationForTag, + traceReferencesTag, } ) @@ -1954,6 +1956,10 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext, ctx.InstallFile(pathInTestCases, ctx.ModuleName()+".jar", j.outputFile) } } + + android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{ + TestSuites: j.testProperties.Test_suites, + }) } func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { @@ -1970,6 +1976,10 @@ func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContex if optionalConfig.Valid() { moduleInfoJSON.TestConfig = append(moduleInfoJSON.TestConfig, optionalConfig.String()) } + + android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{ + TestSuites: j.testHelperLibraryProperties.Test_suites, + }) } func (j *JavaTestImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { |