fix bazel config

Signed-off-by: Jose Nino <jnino@lyft.com>

.bazelrc

@@ -27,7 +27,6 @@ build --javabase=@bazel_tools//tools/jdk:jdk
 build:ios --define=manual_stamp=manual_stamp
 
 # Default flags for builds targeting Android
-build:android --fat_apk_cpu=x86_64
 build:android --define logger=android
 
 # Common flags for release builds
@@ -43,4 +42,6 @@ build:release-ios --config=release-common
 build:release-ios --copt=-fembed-bitcode
 
 # Flags for release builds targeting Android or the JVM
+build:release-android --config=android
 build:release-android --config=release-common
+build:release-android --fat_apk_cpu=x86,armeabi-v7a,arm64-v8a

.github/workflows/artifacts.yml

@@ -25,7 +25,6 @@ jobs:
           current_short_commit=$(git rev-parse --short HEAD)
           bazel build \
               --config=release-android \
-              --fat_apk_cpu=x86,armeabi-v7a,arm64-v8a \
               --define=pom_version=master-$current_short_commit \
               //:android_deploy
       - uses: actions/upload-artifact@v1

.github/workflows/release.yml

@@ -32,7 +32,6 @@ jobs:
           current_release_tag=$(git describe --tags --abbrev=0 --exact-match)
           bazel build \
             --config=release-android \
-            --fat_apk_cpu=x86,armeabi-v7a,arm64-v8a \
             --define=pom_version="${current_release_tag:1}" \
             //:android_deploy
       - name: 'Configure gpg signing'

docs/root/development/performance/cpu_battery_impact.rst

@@ -94,7 +94,7 @@ a process listening to traffic sent over this connection.
 
 Getting the build:
 
-1. Build the library using ``bazel build android_dist --config=android``
+1. Build the library using ``bazel build android_dist --fat_apk_cpu=armeabi-v7a``
 2. Control: ``bazel mobile-install //examples/kotlin/control:hello_control_kt``
 3. Envoy: ``bazel mobile-install //examples/kotlin/hello_world:hello_envoy_kt --fat_apk_cpu=armeabi-v7a``
 

docs/root/start/building/building.rst

@@ -51,7 +51,7 @@ Android AAR
 Envoy Mobile can be compiled into an ``.aar`` file for use with Android apps.
 This command is defined in the main :repo:`BUILD <BUILD>` file of the repo, and may be run locally:
 
-``bazel build android_dist --config=android``
+``bazel build android_dist --config=android --fat_apk_cpu=<arch1,arch2>``
 
 Upon completion of the build, you'll see an ``envoy.aar`` file at :repo:`dist/envoy.aar <dist>`.
 
@@ -63,7 +63,7 @@ an example of how this artifact may be used.
 **When building the artifact for release** (usage outside of development), be sure to include the
 ``--config=release-android`` option, along with the architectures for which the artifact is being built:
 
-``bazel build android_dist --config=release-android --fat_apk_cpu=x86,x86_64,armeabi-v7a,arm64-v8a``
+``bazel build android_dist --config=release-android``
 
 For a demo of a working app using this artifact, see the :ref:`hello_world` example.