Merge changes I7b6c6ce0,If0eaf5d5
* changes:
Allow java modules to use filegroups
Rename no_standard_libraries to no_standard_libs
diff --git a/java/config/config.go b/java/config/config.go
index c6c8fff..4a5a2dd 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -55,6 +55,8 @@
pctx.SourcePathVariable("JavaCmd", "${JavaToolchain}/java")
pctx.SourcePathVariable("JarCmd", "${JavaToolchain}/jar")
pctx.SourcePathVariable("JavadocCmd", "${JavaToolchain}/javadoc")
+ pctx.SourcePathVariable("JlinkCmd", "${JavaToolchain}/jlink")
+ pctx.SourcePathVariable("JmodCmd", "${JavaToolchain}/jmod")
pctx.StaticVariable("Zip2ZipCmd", filepath.Join("${bootstrap.ToolDir}", "zip2zip"))
pctx.SourcePathVariable("JarArgsCmd", "build/soong/scripts/jar-args.sh")
diff --git a/java/config/makevars.go b/java/config/makevars.go
index 29ef57d..eda6c09 100644
--- a/java/config/makevars.go
+++ b/java/config/makevars.go
@@ -45,4 +45,9 @@
ctx.Strict("TARGET_JAVAC", "${JavacCmd} ${CommonJdkFlags}")
ctx.Strict("HOST_JAVAC", "${JavacCmd} ${CommonJdkFlags}")
}
+
+ if ctx.Config().IsEnvTrue("EXPERIMENTAL_USE_OPENJDK9") {
+ ctx.Strict("JLINK", "${JlinkCmd}")
+ ctx.Strict("JMOD", "${JmodCmd}")
+ }
}
diff --git a/root.bp b/root.bp
index 582552e..31a95fd 100644
--- a/root.bp
+++ b/root.bp
@@ -18,6 +18,7 @@
"development/*",
"device/*/*",
"external/*",
+ "external/python/*",
"frameworks/*",
"frameworks/compile/*",
"frameworks/hardware/interfaces",