diff options
| author |  Alex Humesky <ahumesky@google.com> | 2015-10-26 16:28:07 +0000 |
|---|---|---|
| committer |  Florian Weikert <fwe@google.com> | 2015-10-27 11:48:15 +0000 |
| commit | b0d7a7df0b3af5b538fe8baf196d5e9ea861f6c1 (patch) | |
| tree | 34eb7fc5050a4e2f39c241c57c0ef9a98ad7744c /src | |
| parent | bde422dbe7f22567856f2ffbb51096339a730953 (diff) | |
Fixes the options build files when used from the default_android_tools repository:
http://ci.bazel.io/job/Tutorial/PLATFORM_NAME=linux-x86_64/65/console
The build files for options were refactored, which broke part of the hack that
assembles the default_android_tools repository, causing idlclass_lib to fail to build.
src/main/java/com/google/devtools/common/options/BUILD was added, and the idlclass_lib dependency was changed from //src/main/java:options to
//src/main/java/com/google/devtools/common/options, but the code that assembles the default_android_tools repository was only globbing the java sources, and added a build file to src/main/java, so idlclass_lib would look for the options at the deeper path, which didn't exist inside default_android_tools.
--
MOS_MIGRATED_REVID=106306493
Diffstat (limited to 'src')
| -rw-r--r-- | src/BUILD | 4 | ||||
| -rw-r--r-- | src/main/java/BUILD | 8 | ||||
| -rw-r--r-- | src/main/java/options.BUILD | 13 |
3 files changed, 1 insertions, 24 deletions
@@ -73,8 +73,8 @@ genrule( "//src/tools/android/java/com/google/devtools/build/android/idlclass:srcs", "//src/tools/android/java/com/google/devtools/build/android/incrementaldeployment:srcs", "//src/tools/android/java/com/google/devtools/build/android/ziputils:srcs", + "//src/main/java/com/google/devtools/common/options:srcs", "//src/main/protobuf:srcs", - "//src/main/java:options-srcs", ], outs = ["embedded_tools.zip"], cmd = "\n".join([ @@ -86,8 +86,6 @@ genrule( "touch $(@D)/embedded-tools-zip/WORKSPACE", "mkdir -p $(@D)/embedded-tools-zip/tools/defaults", "touch $(@D)/embedded-tools-zip/tools/defaults/BUILD", - "mv $(@D)/embedded-tools-zip/src/main/java/options.BUILD" + - " $(@D)/embedded-tools-zip/src/main/java/BUILD", "find $(@D)/embedded-tools-zip -exec touch -t 198001010000.00 '{}' ';'", "P=$$PWD; (cd $(@D)/embedded-tools-zip && zip -qrD $$P/$@ *)", "rm -fr $(@D)/embedded-tools-zip", diff --git a/src/main/java/BUILD b/src/main/java/BUILD index 9038458977..a6a7ab37f0 100644 --- a/src/main/java/BUILD +++ b/src/main/java/BUILD @@ -76,14 +76,6 @@ java_library( ], ) -filegroup( - name = "options-srcs", - srcs = glob([ - "com/google/devtools/common/options/*.java", - ]) + ["options.BUILD"], - visibility = ["//src:__subpackages__"], -) - java_library( name = "syntax", srcs = glob(["com/google/devtools/build/lib/syntax/*.java"]), diff --git a/src/main/java/options.BUILD b/src/main/java/options.BUILD deleted file mode 100644 index 844cf2a61a..0000000000 --- a/src/main/java/options.BUILD +++ /dev/null @@ -1,13 +0,0 @@ -# TODO(dmarting): to make clearer, instead of doing that, we should -# move every target of the BUILD file into there java package. -java_library( - name = "options", - srcs = glob([ - "com/google/devtools/common/options/*.java", - ]), - visibility = ["//visibility:public"], - deps = [ - "//third_party:guava", - "//third_party:jsr305", - ], -) |