diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2015-05-19 17:23:01 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2015-05-21 09:45:13 +0000 |
| commit | 2221860f50ccf2b77065f5e9dd02714706dbfb10 (patch) | |
| tree | 5daa12780138b06d010eeff4deec1a5e44745707 /src/test | |
| parent | 7b31c3c461188ad2180ae7c25534e6531f8a3732 (diff) | |
Add a --javac_extdir flag to enable configuring the javac -extdirs flag
The -extdirs flag sets a search path to the directory containing the JDK's
extension classes, and should always be set explicitly when cross-compiling. If
it is unset, the ext directory of the host JDK will be used instead.
javac requires that -extdirs be a list of directories. The blaze --javac_extdir
flag takes the label of a filegroup with the 'path' attribute set, and passes
the directory path through to JavaBuilder.
--
MOS_MIGRATED_REVID=94001278
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 1 | ||||
| -rw-r--r-- | src/test/shell/bazel/BUILD | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 09e0d12eea..66a30e102a 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -52,6 +52,7 @@ public class BazelAnalysisMock extends AnalysisMock { "filegroup(name = 'jdk', srcs = [':jdk-default', ':jdk-null'])", "filegroup(name='langtools', srcs=['jdk/lib/tools.jar'])", "filegroup(name='bootclasspath', srcs=['jdk/jre/lib/rt.jar'])", + "filegroup(name='extdir', srcs=glob(['jdk/jre/lib/ext/*']))", "filegroup(name='java', srcs = ['jdk/jre/bin/java'])", "exports_files(['JavaBuilder_deploy.jar','SingleJar_deploy.jar',", " 'JavaBuilderCanary_deploy.jar', 'ijar'])"); diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 28a244fde5..44c7306c13 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -8,6 +8,7 @@ filegroup( "testenv.sh", "//examples:srcs", "//external:bootclasspath", + "//external:extdir", "//external:jdk-default", "//external:langtools", "//src:bazel", |