Skip to content

Commit

Permalink
Comment out android_ndk_repository line in WORKSPACE file
Browse files Browse the repository at this point in the history
and point to more representative GitHub issue.

Signed-off-by: JP Simard <jp@jpsim.com>
  • Loading branch information
jpsim committed Feb 3, 2022
1 parent cba9d40 commit 00a0557
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 17 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/android_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ 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 @@ -72,6 +74,8 @@ 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 @@ -115,6 +119,8 @@ 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
2 changes: 0 additions & 2 deletions .github/workflows/android_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ jobs:
java-version: '8'
java-package: jdk
architecture: x64
- name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/2722
run: sed -i '/^android_ndk_repository/ d' WORKSPACE
- name: 'Run Kotlin library integration tests'
if: steps.check_context.outputs.run_tests == 'true'
env:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ jobs:
java-version: '8'
java-package: jdk
architecture: x64
- name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/2722
run: sed -i '/^android_ndk_repository/ d' WORKSPACE
- name: 'Run tests'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/cc_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: true
- name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/2722
run: sed -i '/^android_ndk_repository/ d' WORKSPACE
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
name: 'Run tests'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ jobs:
echo "Skipping coverage."
echo "::set-output name=run_coverage::false"
fi
- name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/2722
run: sed -i '/^android_ndk_repository/ d' WORKSPACE
- name: 'Run coverage'
if: steps.check_context.outputs.run_coverage == 'true'
continue-on-error: true
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: true
- name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/2722
run: sed -i '/^android_ndk_repository/ d' WORKSPACE
- name: 'Build test binary'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -48,8 +46,6 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: true
- name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/2722
run: sed -i '/^android_ndk_repository/ d' WORKSPACE
- name: 'Build test binary'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/python_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ jobs:
echo "Skipping tests."
echo "::set-output name=run_tests::false"
fi
- name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/2722
run: sed -i '/^android_ndk_repository/ d' WORKSPACE
- name: 'Run tests'
if: steps.check_context.outputs.run_tests == 'true'
env:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/tsan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ jobs:
java-version: '8'
java-package: jdk
architecture: x64
- name: 'Work around android_sdk_repository bug' # https://github.com/bazelbuild/bazel/issues/2722
run: sed -i '/^android_ndk_repository/ d' WORKSPACE
- name: 'Run tests'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
5 changes: 4 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,7 @@ load("//bazel:python.bzl", "declare_python_abi")
declare_python_abi(name = "python_abi", python_version = "3")

android_sdk_repository(name = "androidsdk", api_level = 30, build_tools_version = "30.0.2")
android_ndk_repository(name = "androidndk", api_level = 21)

# TODO(jpsim): Uncomment this line once this issue is resolved: https://github.com/bazelbuild/bazel/issues/14260
# To build any Android targets, uncomment the following line:
# android_ndk_repository(name = "androidndk", api_level = 21)
5 changes: 5 additions & 0 deletions docs/root/start/building/building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ 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
Empty file modified third_party/rbe_configs/LICENSE
100755 → 100644
Empty file.
Empty file modified third_party/rbe_configs/config/BUILD
100755 → 100644
Empty file.

0 comments on commit 00a0557

Please sign in to comment.