Backed out changeset db3e18c3e3fa (bug 1389257) for conflicting with the incoming m-c merge a=backout

MozReview-Commit-ID: BoVZfQtAAwZ

mobile/android/base/generate_build_config.py

@@ -50,6 +50,7 @@ def _defines():
                 'MOZ_ANDROID_PWA',
                 'MOZ_LEANPLUM_SDK_KEY',
                 'MOZ_LEANPLUM_SDK_CLIENTID',
+                'MOZ_ANDROID_POCKET',
                 'MOZ_ANDROID_SEARCH_ACTIVITY',
                 'MOZ_CRASHREPORTER',
                 'MOZ_DEBUG',

mobile/android/config/mozconfigs/android-aarch64/debug

@@ -10,7 +10,6 @@ ac_add_options --target=aarch64-linux-android
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
-export MOZ_ANDROID_POCKET
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 

mobile/android/config/mozconfigs/android-aarch64/nightly

@@ -14,6 +14,5 @@ STRIP_FLAGS="--strip-debug"
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
-export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android-api-15-frontend/nightly

@@ -40,6 +40,5 @@ STRIP_FLAGS="--strip-debug"
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
-export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly

@@ -42,7 +42,6 @@ STRIP_FLAGS="--strip-debug"
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
-export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
 

mobile/android/config/mozconfigs/android-x86/debug

@@ -9,7 +9,6 @@ ac_add_options --with-android-min-sdk=16
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
-export MOZ_ANDROID_POCKET=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 

mobile/android/config/mozconfigs/android-x86/nightly

@@ -13,6 +13,5 @@ STRIP_FLAGS="--strip-debug"
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
-export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android-x86/nightly-old-id

@@ -13,6 +13,5 @@ STRIP_FLAGS="--strip-debug"
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
-export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/common

@@ -79,10 +79,8 @@ else
 fi
 
 # MOZ_ANDROID_POCKET depends on --with-pocket-api-keyfile, and will
-# fail if MOZ_ANDROID_POCKET is specified but a keyfile is not. There's no default
-# keyfile set, so if we misconfigure beta or release or nightly, the builds will
-# fail (at configure time).
-# Otherwise, Pocket is not a critical component so it can be built with a dummy key.
+# fail if MOZ_ANDROID_POCKET is specified but a keyfile is not. We set a default
+# dummy key for non-channel builds, because Pocket is not a critical component.
 if test "$MOZ_UPDATE_CHANNEL" = "release" ; then
     ac_add_options --with-pocket-api-keyfile=/builds/pocket-api-release.token
 elif test "$MOZ_UPDATE_CHANNEL" = "beta" ; then

mobile/android/moz.configure

@@ -46,7 +46,7 @@ set_config('MOZ_ANDROID_MMA',
 
 option(env='MOZ_ANDROID_POCKET',
        help='Enable Pocket Stories in Activity Stream.',
-       default=False)
+       default=True)
 
 set_config('MOZ_ANDROID_POCKET',
            depends_if('MOZ_ANDROID_POCKET')(lambda _: True))