diff options
author | 2018-05-16 10:49:29 -0700 | |
---|---|---|
committer | 2018-05-16 10:49:29 -0700 | |
commit | 2acf23109aabb2952ce73dee89fe1e63b0e80961 (patch) | |
tree | 54724426fcf6d8d9a5dab57862ae749997dc5fd5 /tools/bazel.rc | |
parent | 7a667f694fc25691d1093019a6fe4e0cd32fd344 (diff) | |
parent | 383e6d48dfd5037bcb5d56937366f1ba12b9a67d (diff) |
resolving the conflict while merging master
Diffstat (limited to 'tools/bazel.rc')
-rw-r--r-- | tools/bazel.rc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/bazel.rc b/tools/bazel.rc index 1c1e6afb65..03aa52da1f 100644 --- a/tools/bazel.rc +++ b/tools/bazel.rc @@ -1,8 +1,14 @@ +# By default, we don't distinct target and host platfroms. +# When doing cross compilation, use --config=cross_compile to distinct them. +build --distinct_host_configuration=false +build:cross_compile --distinct_host_configuration=true + # 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 --config=cross_compile build:android_arm --config=android build:android_arm --cpu=armeabi-v7a build:android_arm --fat_apk_cpu=armeabi-v7a |