diff options
| author | Colin Cross <ccross@android.com> | 2017-09-27 17:33:10 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-09-27 23:21:36 -0700 |
| commit | 86a63ff366f386f9ff29e5092a724faad95b05dd (patch) | |
| tree | f8208cd0d97bbc715e66d32ae9d01c4d2d4ab016 /java/java.go | |
| parent | bd425497437e92d5b313702122586ab2ea5d6276 (diff) | |
Rename resource_dirs to java_resource_dirs
For consistency with make, rename java resources to
java_resource_dirs and android resources to resource_dirs.
Test: m -j checkbuild
Change-Id: Ie9aac50fef40f6a9093b4b98759e79cd086bb797
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 4 insertions, 4 deletions
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) |