Skip to content

Commit

Permalink
Revert "Comment out android_ndk_repository line in WORKSPACE file"
Browse files Browse the repository at this point in the history
This reverts commits 00a0557 &
b11cd4d.

Signed-off-by: JP Simard <jp@jpsim.com>
  • Loading branch information
jpsim committed Feb 4, 2022
1 parent a97ba24 commit 3047dae
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/android_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
5 changes: 0 additions & 5 deletions docs/root/start/building/building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
<https://github.com/bazelbuild/bazel/issues/14260>`_. Take care not to check in those changes to source
control.

----------------
iOS requirements
----------------
Expand Down

0 comments on commit 3047dae

Please sign in to comment.