diff options
| author |  Austin Anderson <angerson@google.com> | 2018-01-10 15:16:01 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-01-10 15:21:40 -0800 |
| commit | 0f68a22758b4333ace28e857ef927354e6aeac09 (patch) | |
| tree | 7f1277e5dc2ae09b3b2cf4f29f15d819eb216b86 /tools | |
| parent | b152f0517f318db6dcd7cfba57d860d2e5eed433 (diff) | |
Add --fat_apk_cpu=arm64-v8a for arm64 Android builds
Bazel silently uses the wrong build settings for --config=android_arm64 (--cpu=arm64-v8a is not enough), and actually still uses armeabi-v7a in at least some cases. --fat_apk_cpu fixes this.
See #15581 for more.
PiperOrigin-RevId: 181525260
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bazel.rc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/bazel.rc b/tools/bazel.rc index 44bfe9f0c2..8b8c717561 100644 --- a/tools/bazel.rc +++ b/tools/bazel.rc @@ -1,10 +1,14 @@ -# Android configs +# Android configs. Bazel needs to have --cpu and --fat_apk_cpu both set to the +# target CPU to build transient dependencies correctly. See +# https://docs.bazel.build/versions/master/user-manual.html#flag--fat_apk_cpu build:android --crosstool_top=//external:android/crosstool build:android --host_crosstool_top=@bazel_tools//tools/cpp:toolchain build:android_arm --config=android build:android_arm --cpu=armeabi-v7a +build:android_arm --fat_apk_cpu=armeabi-v7a build:android_arm64 --config=android build:android_arm64 --cpu=arm64-v8a +build:android_arm64 --fat_apk_cpu=arm64-v8a # Config to use a mostly-static build and disable modular op registration # support (this will revert to loading TensorFlow with RTLD_GLOBAL in Python). |