From 2b64af861a7cf6100cb652659262d402ea3ca5c1 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 13 Dec 2023 18:22:18 -0800 Subject: [PATCH] Allow compile_data on all java modules art java_test modules need to specify compile_data, make it common to all java modules. Bug: 307824623 Test: m lint-check Change-Id: I68640f14137f9cadaf0c454d3b5abc9e2d1d9b4b --- java/app.go | 7 ------- java/base.go | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/app.go b/java/app.go index d5c4ebaaf..ee82a3225 100755 --- a/java/app.go +++ b/java/app.go @@ -139,12 +139,6 @@ type appProperties struct { // PRODUCT_CHARACTERISTICS. Generate_product_characteristics_rro *bool - // A list of files or dependencies to make available to the build sandbox. This is - // useful if source files are symlinks, the targets of the symlinks must be listed here. - // Note that currently not all actions implemented by android_apps are sandboxed, so you - // may only see this being necessary in lint builds. - Compile_data []string - ProductCharacteristicsRROPackageName *string `blueprint:"mutated"` ProductCharacteristicsRROManifestModuleName *string `blueprint:"mutated"` } @@ -824,7 +818,6 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { a.linter.mergedManifest = a.aapt.mergedManifestFile a.linter.manifest = a.aapt.manifestPath a.linter.resources = a.aapt.resourceFiles - a.linter.compile_data = android.PathsForModuleSrc(ctx, a.appProperties.Compile_data) a.linter.buildModuleReportZip = ctx.Config().UnbundledBuildApps() dexJarFile, packageResources := a.dexBuildActions(ctx) diff --git a/java/base.go b/java/base.go index cdb58a2f9..7cd28207f 100644 --- a/java/base.go +++ b/java/base.go @@ -195,6 +195,12 @@ type CommonProperties struct { // If true, then only the headers are built and not the implementation jar. Headers_only *bool + + // A list of files or dependencies to make available to the build sandbox. This is + // useful if source files are symlinks, the targets of the symlinks must be listed here. + // Note that currently not all actions implemented by android_apps are sandboxed, so you + // may only see this being necessary in lint builds. + Compile_data []string `android:"path"` } // Properties that are specific to device modules. Host module factories should not add these when @@ -1677,6 +1683,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath j.linter.compileSdkKind = j.SdkVersion(ctx).Kind j.linter.javaLanguageLevel = flags.javaVersion.String() j.linter.kotlinLanguageLevel = "1.3" + j.linter.compile_data = android.PathsForModuleSrc(ctx, j.properties.Compile_data) if !apexInfo.IsForPlatform() && ctx.Config().UnbundledBuildApps() { j.linter.buildModuleReportZip = true }