diff options
| author |  Googler <noreply@google.com> | 2017-02-07 19:43:37 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-02-08 15:51:18 +0000 |
| commit | d11d510c571b10787856395709f9ad945ca70bb2 (patch) | |
| tree | 94945834aadce97972f63f7c622a64ea3de97e2d /src/test | |
| parent | 2dc8e861e2dc2bfbea19d95ff92dcdf569a1bcba (diff) | |
Move all the resource processing tools into a "busybox".
This makes the code simpler as well as reducing the number of targets to build.
It also makes testing and profiling different action strategies vastly easier.
--
PiperOrigin-RevId: 146812659
MOS_MIGRATED_REVID=146812659
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, 2 insertions, 17 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 c22249b24e..aff2791531 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,13 +166,7 @@ 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 = '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 = 'busybox', 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 0bd8a35e72..758ddd6c10 100644 --- a/src/test/shell/bazel/android/BUILD +++ b/src/test/shell/bazel/android/BUILD @@ -16,15 +16,6 @@ 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: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", + "//src/tools/android/java/com/google/devtools/build/android:ResourceProcessorBusyBox_deploy.jar", ], ) |