diff options
| author | Colin Cross <ccross@android.com> | 2015-04-20 13:51:48 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-20 13:52:55 -0700 |
| commit | 276284f577ea7ec29f7e78f8b23955a0b3b69032 (patch) | |
| tree | 5c5483b89258f0671302f88f1b106a8f33800b19 /java | |
| parent | d560a9e192694f4edf37364c6995627918efaafd (diff) | |
| download | build_soong-276284f577ea7ec29f7e78f8b23955a0b3b69032.tar.gz build_soong-276284f577ea7ec29f7e78f8b23955a0b3b69032.tar.bz2 build_soong-276284f577ea7ec29f7e78f8b23955a0b3b69032.zip | |
Rename resource_dirs to java_resource_dirs
Java vs. Android resource directories are already confusing enough,
rename resource_dirs to java_resource_dirs to make room for
android_resource_dirs.
Change-Id: Iffd087860b98df29e81d8d2f823be87c8227e614
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 533cabbd..215924bb 100644 --- a/java/java.go +++ b/java/java.go @@ -55,8 +55,8 @@ type javaBase struct { // or .aidl files. Srcs []string `android:"arch_variant,arch_subtract"` - // resource_dirs: list of directories containing resources - Resource_dirs []string `android:"arch_variant"` + // java_resource_dirs: list of directories containing Java resources + Java_resource_dirs []string `android:"arch_variant"` // no_standard_libraries: don't build against the default libraries (core-libart, core-junit, // ext, and framework for device targets) @@ -279,7 +279,8 @@ func (j *javaBase) GenerateJavaBuildActions(ctx common.AndroidModuleContext) { classJarSpecs = append([]jarSpec{classes}, classJarSpecs...) } - resourceJarSpecs = append(ResourceDirsToJarSpecs(ctx, j.properties.Resource_dirs), resourceJarSpecs...) + resourceJarSpecs = append(ResourceDirsToJarSpecs(ctx, j.properties.Java_resource_dirs), + resourceJarSpecs...) manifest := j.properties.Manifest if manifest != "" { |