diff options
| author |  Alex Humesky <ahumesky@google.com> | 2017-02-07 20:44:52 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-02-08 15:51:22 +0000 |
| commit | 602a98cbebeff2ba1c2d8605a9552b2c8f5622ae (patch) | |
| tree | e8aa7a533d15e284de6cb88f3a79ad075e140031 /src/test | |
| parent | e3c4d32bc4d209df56562250c1bbcfd2622bfc0c (diff) | |
Rollback of commit d11d510c571b10787856395709f9ad945ca70bb2.
*** Reason for rollback ***
--
PiperOrigin-RevId: 146820790
MOS_MIGRATED_REVID=146820790
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 8 | ||||
| -rw-r--r-- | src/test/shell/bazel/android/BUILD | 11 |
2 files changed, 17 insertions, 2 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 aff2791531..c22249b24e 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 @@ -166,7 +166,13 @@ public final class BazelAnalysisMock extends AnalysisMock { .add("sh_binary(name = 'aar_native_libs_zip_creator', srcs = ['empty.sh'])") .add("sh_binary(name = 'dexbuilder', srcs = ['empty.sh'])") .add("sh_binary(name = 'dexmerger', srcs = ['empty.sh'])") - .add("sh_binary(name = 'busybox', srcs = ['empty.sh'])") + .add("sh_binary(name = 'manifest_merger', srcs = ['empty.sh'])") + .add("sh_binary(name = 'rclass_generator', srcs = ['empty.sh'])") + .add("sh_binary(name = 'resources_processor', srcs = ['empty.sh'])") + .add("sh_binary(name = 'resource_merger', srcs = ['empty.sh'])") + .add("sh_binary(name = 'resource_parser', srcs = ['empty.sh'])") + .add("sh_binary(name = 'resource_shrinker', srcs = ['empty.sh'])") + .add("sh_binary(name = 'resource_validator', srcs = ['empty.sh'])") .add("sh_binary(name = 'rex_wrapper', srcs = ['empty.sh'])") .add("android_library(name = 'incremental_stub_application')") .add("android_library(name = 'incremental_split_stub_application')") diff --git a/src/test/shell/bazel/android/BUILD b/src/test/shell/bazel/android/BUILD index 758ddd6c10..0bd8a35e72 100644 --- a/src/test/shell/bazel/android/BUILD +++ b/src/test/shell/bazel/android/BUILD @@ -16,6 +16,15 @@ sh_test( # labels, there isn't really a better option. "//external:android_ndk_for_testing", "//external:android_sdk_for_testing", - "//src/tools/android/java/com/google/devtools/build/android:ResourceProcessorBusyBox_deploy.jar", + "//src/tools/android/java/com/google/devtools/build/android:AarGeneratorAction_deploy.jar", + "//src/tools/android/java/com/google/devtools/build/android:AndroidResourceMergingAction_deploy.jar", + "//src/tools/android/java/com/google/devtools/build/android:AndroidResourceParsingAction_deploy.jar", + "//src/tools/android/java/com/google/devtools/build/android:AndroidResourceProcessingAction_deploy.jar", + "//src/tools/android/java/com/google/devtools/build/android:AndroidResourceValidatorAction_deploy.jar", + "//src/tools/android/java/com/google/devtools/build/android:RClassGeneratorAction_deploy.jar", + "//src/tools/android/java/com/google/devtools/build/android:ResourceShrinkerAction_deploy.jar", + "//src/tools/android/java/com/google/devtools/build/android/incrementaldeployment:srcs", + "//src/tools/android/java/com/google/devtools/build/android/ziputils:mapper_deploy.jar", + "//src/tools/android/java/com/google/devtools/build/android/ziputils:reducer_deploy.jar", ], ) |