Skip to content

Commit

Permalink
Backed out 2 changesets (bug 1652870) for Android bustage. CLOSED TREE
Browse files Browse the repository at this point in the history
Backed out changeset 48a10a9249b0 (bug 1652870)
Backed out changeset 94ffbec77e89 (bug 1652870)
  • Loading branch information
dgluca committed Jul 15, 2020
1 parent 4d91dab commit 62584e3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion mobile/android/config/mozconfigs/common
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ if [ -z "$NO_NDK" -a -z "$USE_ARTIFACT" ]; then
# Make sure that any host binaries we build use whatever libraries clang
# linked against, rather than what's on the system.
mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib"
export DUMP_SYMS="$MOZ_FETCHES_DIR/dump_syms/dump_syms"
# Enable static analysis plugin
export ENABLE_CLANG_PLUGIN=1
fi
Expand Down
1 change: 0 additions & 1 deletion taskcluster/ci/build/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ job-defaults:
- linux64-rust-android
- linux64-rust-size
- linux64-cbindgen
- linux64-dump-syms
- linux64-nasm
- linux64-node

Expand Down
2 changes: 1 addition & 1 deletion toolkit/moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -1967,7 +1967,7 @@ set_define('MOZ_RUST_FXA_CLIENT', True, when=rust_fxa_client)
# ==============================================================

check_prog('DUMP_SYMS', ['dump_syms'], allow_missing=True, paths=toolchain_search_path,
when=compile_environment & (target_is_windows | target_is_android))
when=compile_environment & target_is_windows)


check_prog('PDBSTR', ['pdbstr.exe'], allow_missing=True, paths=toolchain_search_path,
Expand Down

0 comments on commit 62584e3

Please sign in to comment.