openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Colin Cross 2015-04-20 13:51:48 -07:00
parent d560a9e192
commit 276284f577
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
androidmk/cmd/androidmk/android.go
View File

@ -44,7 +44,7 @@ var listProperties = map[string]string{
"LOCAL_CLANG_CFLAGS": "clang_cflags",
"LOCAL_YACCFLAGS": "yaccflags",
"LOCAL_JAVA_RESOURCE_DIRS": "resource_dirs",
"LOCAL_JAVA_RESOURCE_DIRS": "java_resource_dirs",
"LOCAL_JAVACFLAGS": "javacflags",
"LOCAL_DX_FLAGS": "dxflags",
"LOCAL_JAVA_LIBRARIES": "java_libs",

7
java/java.go
View File

@ -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 != "" {