diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 6 | ||||
| -rw-r--r-- | java/java.go | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/java/app.go b/java/app.go index 80d62fda8..e40478a75 100644 --- a/java/app.go +++ b/java/app.go @@ -53,8 +53,8 @@ type androidAppProperties struct { Asset_dirs []string // list of directories relative to the Blueprints file containing - // Java resources - Android_resource_dirs []string + // Android resources + Resource_dirs []string } type AndroidApp struct { @@ -183,7 +183,7 @@ func (a *AndroidApp) aaptFlags(ctx android.ModuleContext) ([]string, android.Pat } assetDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.appProperties.Asset_dirs, "assets") - resourceDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.appProperties.Android_resource_dirs, "res") + resourceDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.appProperties.Resource_dirs, "res") var overlayResourceDirs android.Paths // For every resource directory, check if there is an overlay directory with the same path. diff --git a/java/java.go b/java/java.go index 5e063a527..5b82fb3f9 100644 --- a/java/java.go +++ b/java/java.go @@ -70,10 +70,10 @@ type CompilerProperties struct { Exclude_srcs []string `android:"arch_variant"` // list of directories containing Java resources - Resource_dirs []string `android:"arch_variant"` + Java_resource_dirs []string `android:"arch_variant"` - // list of directories that should be excluded from resource_dirs - Exclude_resource_dirs []string `android:"arch_variant"` + // list of directories that should be excluded from java_resource_dirs + Exclude_java_resource_dirs []string `android:"arch_variant"` // don't build against the default libraries (legacy-test, core-junit, // ext, and framework for device targets) @@ -430,7 +430,7 @@ func (j *Module) compile(ctx android.ModuleContext) { jars = append(jars, classes) } - resourceJarSpecs := ResourceDirsToJarSpecs(ctx, j.properties.Resource_dirs, j.properties.Exclude_resource_dirs) + resourceJarSpecs := ResourceDirsToJarSpecs(ctx, j.properties.Java_resource_dirs, j.properties.Exclude_java_resource_dirs) if len(resourceJarSpecs) > 0 { // Combine classes + resources into classes-full-debug.jar resourceJar := TransformResourcesToJar(ctx, resourceJarSpecs, extraJarDeps) |