diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml index 4be96f6bd2..2c6fc1496d 100644 --- a/.github/workflows/android_build.yml +++ b/.github/workflows/android_build.yml @@ -33,8 +33,6 @@ jobs: - name: 'Install dependencies' if: steps.check-cache.outputs.cache-hit != 'true' run: ./ci/mac_ci_setup.sh - - name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/14260 - run: sed -i '' 's/# android/android/' WORKSPACE - name: 'Build envoy.aar distributable' if: steps.check-cache.outputs.cache-hit != 'true' env: @@ -74,8 +72,6 @@ jobs: # Return to using: # ./bazelw mobile-install --fat_apk_cpu=x86 --start_app //examples/java/hello_world:hello_envoy # When https://github.com/envoyproxy/envoy-mobile/issues/853 is fixed. - - name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/14260 - run: sed -i '' 's/# android/android/' WORKSPACE - name: 'Start java app' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -119,8 +115,6 @@ jobs: # Return to using: # ./bazelw mobile-install --fat_apk_cpu=x86 --start_app //examples/kotlin/hello_world:hello_envoy_kt # When https://github.com/envoyproxy/envoy-mobile/issues/853 is fixed. - - name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/14260 - run: sed -i '' 's/# android/android/' WORKSPACE - name: 'Start kotlin app' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/docs/root/start/building/building.rst b/docs/root/start/building/building.rst index bdd14a4fd5..404dd7897f 100644 --- a/docs/root/start/building/building.rst +++ b/docs/root/start/building/building.rst @@ -52,11 +52,6 @@ For local builds, set ``ANDROID_HOME`` and ``ANDROID_NDK_HOME`` to point to the See `ci/mac_ci_setup.sh` for the specific NDK version used during builds. -You'll also need to uncomment the ``android_sdk_repository`` line in the ``WORKSPACE`` file to work around -`this bazel issue -`_. Take care not to check in those changes to source -control. - ---------------- iOS requirements ----------------