diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-07-29 15:32:19 +0000 |
|---|---|---|
| committer | Lukacs Berki <lberki@google.com> | 2015-07-29 16:03:57 +0000 |
| commit | a93c63bb96ac9f540d8d39ae4158cc8bd335e127 (patch) | |
| tree | ee11ca8373d5d6c020a607beef70173c9e728abf /src/test/java/com/google | |
| parent | e685ef34b4bec0c7125e7a4041d8598556d73246 (diff) | |
Make Bazel always build with --fat_apk_cpu.
Also tweak the Android NDK CROSSTOOL file a bit so that it actually works.
Fixes #335.
--
MOS_MIGRATED_REVID=99377509
Diffstat (limited to 'src/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 11 |
1 files changed, 10 insertions, 1 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 a569a7a98d..132a11d066 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 @@ -62,7 +62,10 @@ public class BazelAnalysisMock extends AnalysisMock { "exports_files(['JavaBuilder_deploy.jar','SingleJar_deploy.jar',", " 'JavaBuilderCanary_deploy.jar', 'ijar', 'GenClass_deploy.jar'])"); config.create("tools/cpp/BUILD", - "filegroup(name = 'toolchain', srcs = [':cc-compiler-local', ':empty'])", + "filegroup(name = 'toolchain', ", + " srcs = [':cc-compiler-local', ':cc-compiler-darwin', ':cc-compiler-piii',", + " ':cc-compiler-armeabi-v7a', ':empty'],", + ")", "cc_toolchain(name = 'cc-compiler-k8', all_files = ':empty', compiler_files = ':empty',", " cpu = 'local', dwp_files = ':empty', dynamic_runtime_libs = [':empty'], ", " linker_files = ':empty',", @@ -78,6 +81,12 @@ public class BazelAnalysisMock extends AnalysisMock { " cpu = 'local', dwp_files = ':empty', dynamic_runtime_libs = [':empty'], ", " linker_files = ':empty',", " objcopy_files = ':empty', static_runtime_libs = [':empty'], strip_files = ':empty',", + ")", + "cc_toolchain(name = 'cc-compiler-armeabi-v7a', all_files = ':empty', ", + " compiler_files = ':empty',", + " cpu = 'local', dwp_files = ':empty', dynamic_runtime_libs = [':empty'], ", + " linker_files = ':empty',", + " objcopy_files = ':empty', static_runtime_libs = [':empty'], strip_files = ':empty',", ")"); config.create("tools/cpp/CROSSTOOL", readFromResources("MOCK_CROSSTOOL")); config.create("tools/android/BUILD", |