☠☠ backed out by 03297f8c28a0 ☠ ☠ | |
author | Nick Alexander <nalexander@mozilla.com> |
Wed, 27 Jan 2016 12:25:04 -0800 | |
changeset 321086 | e228040a044b7ff7363a178da2cb0b8b42724048 |
parent 321085 | 900f4a6eebc269410a821a885b505c22213b4fb2 |
child 321087 | baf25be8d4917e6dcc52eede79e61e1837328c86 |
push id | 1128 |
push user | jlund@mozilla.com |
push date | Wed, 01 Jun 2016 01:31:59 +0000 |
treeherder | mozilla-release@fe0d30de989d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | gps |
bugs | 1163082 |
milestone | 47.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/configure.in +++ b/configure.in @@ -4003,16 +4003,32 @@ MOZ_ARG_ENABLE_BOOL(android-resource-con 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. + # See https://wiki.mozilla.org/Mobile/Distribution_Files. + if test ! -d "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY/assets/distribution" ; then + AC_MSG_ERROR([--with-android-distribution-directory does not contain assets/distribution; + (looked for ${MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets/distribution).]) + fi +fi +AC_SUBST(MOZ_ANDROID_DISTRIBUTION_DIRECTORY) + dnl ======================================================== dnl = Trademarked Branding dnl ======================================================== MOZ_ARG_ENABLE_BOOL(official-branding, [ --enable-official-branding Enable Official mozilla.org Branding Do not distribute builds with --enable-official-branding unless you have
--- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -60,16 +60,21 @@ android { // Automation builds. automation { } } sourceSets { main { manifest.srcFile "${topobjdir}/mobile/android/base/AndroidManifest.xml" + assets { + if (mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY) { + srcDir "${mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets" + } + } } androidTest { java { srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/src" srcDir "${topsrcdir}/mobile/android/tests/background/junit3/src" srcDir "${topsrcdir}/mobile/android/tests/browser/junit3/src" srcDir "${topsrcdir}/mobile/android/tests/javaddons/src"
--- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -880,16 +880,21 @@ ANDROID_GENERATED_RESFILES += [ 'res/raw/suggestedsites.json', 'res/values/strings.xml', ] ANDROID_ASSETS_DIRS += [ '/mobile/android/app/assets', ] +if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY']: + ANDROID_ASSETS_DIRS += [ + '%' + CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY'] + '/assets', + ] + # We do not expose MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN here because that # would leak the value to build logs. Instead we expose the token quietly where # appropriate in Makefile.in. for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZ_DEBUG', 'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING', 'MOZ_ANDROID_GCM'): if CONFIG[var]:
--- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -73,17 +73,16 @@ @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ # This should be MOZ_CHILD_PROCESS_NAME, but that has a "lib/" prefix. @BINPATH@/@MOZ_CHILD_PROCESS_NAME@ @BINPATH@/@MOZ_CHILD_PROCESS_NAME_PIE@ [xpcom] @BINPATH@/package-name.txt @BINPATH@/classes.dex -@BINPATH@/distribution/* [browser] ; [Base Browser Files] @BINPATH@/application.ini @BINPATH@/platform.ini @BINPATH@/blocklist.xml ; [Components]
--- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -297,17 +297,16 @@ DIST_FILES += \ ua-update.json \ platform.ini \ greprefs.js \ browserconfig.properties \ blocklist.xml \ chrome.manifest \ update.locale \ removed-files \ - distribution \ $(NULL) NON_DIST_FILES = \ classes.dex \ $(NULL) UPLOAD_EXTRA_FILES += gecko-unsigned-unaligned.apk