diff options
| author |  ajmichael <ajmichael@google.com> | 2017-07-24 19:33:18 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-24 21:04:54 +0200 |
| commit | c2188ebef3b1c0437059502779656e3eb4b56d93 (patch) | |
| tree | 5bd8b6e3a42e11f2d8b2e7dd5f99d268444cbd56 /src/test/java/com/google | |
| parent | 5e576637b5705aff0a7bf56b5077463dffcd712f (diff) | |
Make $jarjar_bin point to //tools/android:jarjar_bin.
Fixes TODO in AndroidRuleClasses.java.
RELNOTES: None
PiperOrigin-RevId: 162955052
Diffstat (limited to 'src/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 12 |
1 files changed, 2 insertions, 10 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 cb6e0c667a..a840876685 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 @@ -130,15 +130,6 @@ public final class BazelAnalysisMock extends AnalysisMock { config.create( "/bazel_tools_workspace/tools/genrule/BUILD", "exports_files(['genrule-setup.sh'])"); - config.create( - "/bazel_tools_workspace/third_party/java/jarjar/BUILD", - "package(default_visibility=['//visibility:public'])", - "licenses(['notice'])", - "java_binary(name = 'jarjar_bin',", - " runtime_deps = [ ':jarjar_import' ],", - " main_class = 'com.tonicsystems.jarjar.Main')", - "java_import(name = 'jarjar_import',", - " jars = [ 'jarjar.jar' ])"); config.create("/bazel_tools_workspace/tools/test/BUILD", "filegroup(name = 'runtime', srcs = ['test-setup.sh'],)", @@ -235,7 +226,8 @@ public final class BazelAnalysisMock extends AnalysisMock { .add("sh_binary(name = 'android_runtest', srcs = ['empty.sh'])") .add("sh_binary(name = 'instrumentation_test_entry_point', srcs = ['empty.sh'])") .add("java_plugin(name = 'databinding_annotation_processor',") - .add(" processor_class = 'android.databinding.annotationprocessor.ProcessDataBinding')"); + .add(" processor_class = 'android.databinding.annotationprocessor.ProcessDataBinding')") + .add("sh_binary(name = 'jarjar_bin', srcs = ['empty.sh'])"); return androidBuildContents.build(); } |