Merge "Add compile_data for android apps" into main
This commit is contained in:
@@ -141,6 +141,12 @@ 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"`
|
||||
}
|
||||
@@ -821,6 +827,7 @@ 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)
|
||||
|
Reference in New Issue
Block a user