Skip to content

Commit

Permalink
mobile: Move --noincompatible_enable_android_toolchain_resolution to …
Browse files Browse the repository at this point in the history
…mobile-android config (#37936)

This moves `--noincompatible_enable_android_toolchain_resolution` to
`--config=mobile-android` so that it works on both local and remote
builds.

Risk Level: low
Testing: CI
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a

Signed-off-by: Fredy Wijaya <[email protected]>
  • Loading branch information
fredyw authored Jan 8, 2025
1 parent f213d16 commit f3ee496
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions mobile/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ build:mobile-dbg-ios --config=ios
# Default flags for Android tests
build:mobile-test-android --define=static_extension_registration=disabled
build:mobile-android --android_crosstool_top=@androidndk//:toolchain
build:mobile-android --noincompatible_enable_android_toolchain_resolution

# Default flags for iOS tests.
build:mobile-test-ios --config=ios
Expand Down Expand Up @@ -112,14 +113,12 @@ build:mobile-remote-release-clang-android --config=mobile-remote-release-clang
build:mobile-remote-release-clang-android --android_platforms=//:android_x86_64
build:mobile-remote-release-clang-android --linkopt=-fuse-ld=lld
build:mobile-remote-release-clang-android --config=mobile-android
build:mobile-remote-release-clang-android --noincompatible_enable_android_toolchain_resolution
build:mobile-remote-release-clang-android --fat_apk_cpu x86_64
build:mobile-remote-release-clang-android --fat_apk_cpu=x86_64

build:mobile-remote-release-clang-android-publish --config=mobile-remote-release-clang
build:mobile-remote-release-clang-android-publish --config=mobile-release-android
build:mobile-remote-release-clang-android-publish --android_platforms=//:android_x86_32,//:android_x86_64,//:android_armv7,//:android_arm64
build:mobile-remote-release-clang-android-publish --linkopt=-fuse-ld=lld
build:mobile-remote-release-clang-android-publish --noincompatible_enable_android_toolchain_resolution
build:mobile-remote-release-clang-android-publish --fat_apk_cpu=x86,x86_64,armeabi-v7a,arm64-v8a

# Compile releases optimizing for size (eg -Os, etc).
Expand Down

0 comments on commit f3ee496

Please sign in to comment.