Skip to content

Commit

Permalink
mobile: Fix envoy-xds AAR (#30478)
Browse files Browse the repository at this point in the history
`--config=mobile-release-android` has `--define=google_grpc=disabled`
and if it appears after `--define=google_grpc=enabled`, it will set
`--define=google_grpc=disabled` because the last one set wins. This
PR fixes this issue by moving the `--define=google_grpc=enabled` last
since xDS feature in Envoy Mobile requires Google gRPC.

Signed-off-by: Fredy Wijaya <fredyw@google.com>
  • Loading branch information
fredyw authored Oct 25, 2023
1 parent 88a80e6 commit 0268a2b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/mobile-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,16 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
working-directory: mobile
run: |
# --define=google_grpc=enabled must be defined last because
# --config=mobile-release-android has --define=google_grpc=disabled
version="0.5.0.$(date '+%Y%m%d')"
./bazelw build \
--config=mobile-remote-release-clang \
--remote_header="Authorization=Bearer $GITHUB_TOKEN" \
--fat_apk_cpu=x86,x86_64,armeabi-v7a,arm64-v8a \
--define=pom_version="$version" \
--define=google_grpc=enabled \
--config=mobile-release-android \
--define=google_grpc=enabled \
--linkopt=-fuse-ld=lld \
//:android_xds_dist
- name: 'Tar artifacts'
Expand Down

0 comments on commit 0268a2b

Please sign in to comment.