Bug 1275721 - Remove --enable-android-resource-constrained. r=mshal
MozReview-Commit-ID: DqL0KCkbj9r
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -154,17 +154,16 @@ def old_configure_options(*options):
@old_configure_options(
'--cache-file',
'--enable-accessibility',
'--enable-address-sanitizer',
'--enable-alsa',
'--enable-android-omx',
- '--enable-android-resource-constrained',
'--enable-approximate-location',
'--enable-b2g-bt',
'--enable-b2g-camera',
'--enable-b2g-ril',
'--enable-bundled-fonts',
'--enable-clang-plugin',
'--enable-content-sandbox',
'--enable-cookies',
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -165,27 +165,16 @@ public class AppConstants {
public static final boolean MOZ_EXCLUDE_HYPHENATION_DICTIONARIES =
//#ifdef MOZ_EXCLUDE_HYPHENATION_DICTIONARIES
true;
//#else
false;
//#endif
- /**
- * Whether this APK was built with constrained resources --
- * no xhdpi+ images, for example.
- */
- public static final boolean MOZ_ANDROID_RESOURCE_CONSTRAINED =
-//#ifdef MOZ_ANDROID_RESOURCE_CONSTRAINED
- true;
-//#else
- false;
-//#endif
-
public static final boolean MOZ_SERVICES_HEALTHREPORT =
//#ifdef MOZ_SERVICES_HEALTHREPORT
true;
//#else
false;
//#endif
public static final boolean MOZ_TELEMETRY_ON_BY_DEFAULT =
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -457,18 +457,16 @@ ANDROID_AAPT_IGNORE := !.svn:!.git:.*:<d
# 3: name of ap_ file to write.
# 4: directory to write R.java into.
# 5: directory to write R.txt into.
# We touch the target file before invoking aapt so that aapt's outputs
# are fresher than the target, preventing a subsequent invocation from
# thinking aapt's outputs are stale. This is safe because Make
# removes the target file if any recipe command fails.
-CONSTRAINED_AAPT_CONFIGURATIONS := hdpi
-
define aapt_command
$(1): $$(call mkdir_deps,$(filter-out ./,$(dir $(3) $(4) $(5)))) $(2)
@$$(TOUCH) $$@
$$(AAPT) package -f -m \
-M AndroidManifest.xml \
-I $(ANDROID_SDK)/android.jar \
$(if $(MOZ_ANDROID_MAX_SDK_VERSION),--max-res-version $(MOZ_ANDROID_MAX_SDK_VERSION),) \
--auto-add-overlay \
@@ -476,17 +474,16 @@ define aapt_command
$$(addprefix -A ,$$(ANDROID_ASSETS_DIRS)) \
$(if $(ANDROID_EXTRA_PACKAGES),--extra-packages $$(subst $$(NULL) ,:,$$(strip $$(ANDROID_EXTRA_PACKAGES)))) \
$(if $(ANDROID_EXTRA_RES_DIRS),$$(addprefix -S ,$$(ANDROID_EXTRA_RES_DIRS))) \
--custom-package org.mozilla.gecko \
--non-constant-id \
-F $(3) \
-J $(4) \
--output-text-symbols $(5) \
- $(if $(MOZ_ANDROID_RESOURCE_CONSTRAINED),-c $(CONSTRAINED_AAPT_CONFIGURATIONS),) \
--ignore-assets "$$(ANDROID_AAPT_IGNORE)"
endef
# [Comment 3/3] The first of these rules is used during regular
# builds. The second writes an ap_ file that is only used during
# packaging. It doesn't write the normal ap_, or R.java, since we
# don't want the packaging step to write anything that would make a
# further no-op build do work. See also
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -40,21 +40,18 @@ MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea2
MOZ_APP_STATIC_INI=1
# Enable on-demand decompression. This requires a host compile toolchain to
# build szip to use during packaging.
if test "$COMPILE_ENVIRONMENT"; then
MOZ_ENABLE_SZIP=1
fi
-# Enable second screen using native Android libraries, provided we're
-# not resource constrained.
-if test -z "$MOZ_ANDROID_RESOURCE_CONSTRAINED"; then
- MOZ_NATIVE_DEVICES=1
-fi
+# Enable second screen using native Android libraries.
+MOZ_NATIVE_DEVICES=1
# Enable install tracking SDK if we have Google Play support; MOZ_NATIVE_DEVICES
# is a proxy flag for that support.
if test "$RELEASE_BUILD"; then
if test "$MOZ_NATIVE_DEVICES"; then
MOZ_INSTALL_TRACKING=1
fi
fi
--- a/old-configure.in
+++ b/old-configure.in
@@ -2769,28 +2769,16 @@ AC_SUBST(MOZ_BING_API_KEY)
# Allow specifying an Adjust SDK key file that contains the app token used for
# Adjust SDK requests.
MOZ_ARG_WITH_STRING(adjust-sdk-keyfile,
[ --with-adjust-sdk-keyfile=file Use the app token contained in the given keyfile for Adjust SDK requests],
MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN=`cat $withval`)
AC_SUBST(MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN)
-# Whether this APK is destined for resource constrained devices.
-# We want this in mobile/android/confvars.sh, so it goes early.
-MOZ_ARG_ENABLE_BOOL(android-resource-constrained,
-[ --enable-android-resource-constrained
- Exclude hi-res images and similar from the final APK],
- MOZ_ANDROID_RESOURCE_CONSTRAINED=1)
-
-if test -n "$MOZ_ANDROID_RESOURCE_CONSTRAINED"; then
- AC_DEFINE(MOZ_ANDROID_RESOURCE_CONSTRAINED)
-fi
-AC_SUBST(MOZ_ANDROID_RESOURCE_CONSTRAINED)
-
# Optional Firefox for Android partner distribution directory.
MOZ_ARG_WITH_STRING(android-distribution-directory,
[ --with-android-distribution-directory=dir
Optional Firefox for Android partner distribution directory.],
MOZ_ANDROID_DISTRIBUTION_DIRECTORY=$withval)
if test -n "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY"; then
# A distribution directory must have an assets/distribution directory.