From a93c63bb96ac9f540d8d39ae4158cc8bd335e127 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Wed, 29 Jul 2015 15:32:19 +0000 Subject: 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 --- .../devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/test/java/com/google') 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", -- cgit v1.2.3