From 84fa3f9f72e1221c5cd9e0723bffd0c4475e4914 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sat, 2 Jan 2021 19:27:13 +0000 Subject: Redundant code path cleanup (#1702) Remove various obsolete configure options. Remove Adjust SDK install tracking filth. Remove redundant code paths in old-configure This also optimizes linker use Remove redundant conditional blocks. Rewrite span.h without constexpr use. --- build/autoconf/android.m4 | 6 ------ build/moz.configure/keyfiles.configure | 4 ---- 2 files changed, 10 deletions(-) (limited to 'build') diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4 index 4ab6d5a82..6c55a3f3f 100644 --- a/build/autoconf/android.m4 +++ b/build/autoconf/android.m4 @@ -210,12 +210,6 @@ fi AC_DEFUN([MOZ_ANDROID_INSTALL_TRACKING], [ -if test -n "$MOZ_INSTALL_TRACKING"; then - AC_SUBST(MOZ_INSTALL_TRACKING) - MOZ_ANDROID_AAR(play-services-ads, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, google, com/google/android/gms) - MOZ_ANDROID_AAR(play-services-basement, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, google, com/google/android/gms) -fi - ]) dnl Configure an Android SDK. diff --git a/build/moz.configure/keyfiles.configure b/build/moz.configure/keyfiles.configure index 99df5050c..92aea5eda 100644 --- a/build/moz.configure/keyfiles.configure +++ b/build/moz.configure/keyfiles.configure @@ -36,10 +36,6 @@ def keyfile(desc, help=None, callback=lambda x: x): def simple_keyfile(desc): value = keyfile(desc) set_config('MOZ_%s_KEY' % desc.upper().replace(' ', '_'), value) - # Only really required for MOZ_ADJUST_SDK_KEY currently still used in - # old-configure. - add_old_configure_assignment('MOZ_%s_KEY' % desc.upper().replace(' ', '_'), - value) @template -- cgit v1.2.3