StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow compile_data on all java modules" into main am: c01104234e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2875178

Change-Id: I43abbf6833fade5aa91906a11c79a94d1bd38b50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-12-14 22:19:16 +00:00
committed by Automerger Merge Worker
parent 10d22de5d3 c01104234e
commit 1a09b13d93
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/app.go
View File

@@ -139,12 +139,6 @@ type appProperties struct {
// PRODUCT_CHARACTERISTICS. // PRODUCT_CHARACTERISTICS.
Generate_product_characteristics_rro *bool 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"` ProductCharacteristicsRROPackageName *string `blueprint:"mutated"`
ProductCharacteristicsRROManifestModuleName *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.mergedManifest = a.aapt.mergedManifestFile
a.linter.manifest = a.aapt.manifestPath a.linter.manifest = a.aapt.manifestPath
a.linter.resources = a.aapt.resourceFiles a.linter.resources = a.aapt.resourceFiles
a.linter.compile_data = android.PathsForModuleSrc(ctx, a.appProperties.Compile_data)
a.linter.buildModuleReportZip = ctx.Config().UnbundledBuildApps() a.linter.buildModuleReportZip = ctx.Config().UnbundledBuildApps()
dexJarFile, packageResources := a.dexBuildActions(ctx) dexJarFile, packageResources := a.dexBuildActions(ctx)

7
java/base.go
View File

@@ -195,6 +195,12 @@ type CommonProperties struct {
// If true, then only the headers are built and not the implementation jar. // If true, then only the headers are built and not the implementation jar.
Headers_only *bool 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 // 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.compileSdkKind = j.SdkVersion(ctx).Kind
j.linter.javaLanguageLevel = flags.javaVersion.String() j.linter.javaLanguageLevel = flags.javaVersion.String()
j.linter.kotlinLanguageLevel = "1.3" j.linter.kotlinLanguageLevel = "1.3"
j.linter.compile_data = android.PathsForModuleSrc(ctx, j.properties.Compile_data)
if !apexInfo.IsForPlatform() && ctx.Config().UnbundledBuildApps() { if !apexInfo.IsForPlatform() && ctx.Config().UnbundledBuildApps() {
j.linter.buildModuleReportZip = true j.linter.buildModuleReportZip = true
} }