Backed out changeset d60f1d602dca (bug 1372486)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 17 Jun 2017 20:12:34 +0200
changeset 364541 f362fd82fd6005b357065992c7e0471532bd9ecd
parent 364540 b5bdd69dfa60f745727fb3d594199ddc8ce374b1
child 364542 f26e5ef35d118ceeded19fe1ee1ba12552c9b1ff
push id32047
push userarchaeopteryx@coole-files.de
push dateSun, 18 Jun 2017 18:28:16 +0000
treeherdermozilla-central@ae20db43e815 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1372486
milestone56.0a1
backs outd60f1d602dca2ba9fbd0230f2c879f03a42c9be1
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
Backed out changeset d60f1d602dca (bug 1372486)
mobile/android/base/moz.build
mobile/android/moz.configure
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -1365,28 +1365,16 @@ if CONFIG['MOZ_ANDROID_MMA']:
         CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
         CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
         'sync-thirdparty.jar',
     ]
 
 # Putting branding earlier allows branders to override default resources.
 ANDROID_RES_DIRS += [
     '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
-]
-
-if CONFIG['MOZ_ANDROID_PHOTON']:
-    ANDROID_RES_DIRS += [
-        '/mobile/android/app/src/photon/res',
-    ]
-else:
-    ANDROID_RES_DIRS += [
-        '/mobile/android/app/src/australis/res',
-    ]
-
-ANDROID_RES_DIRS += [
     '/mobile/android/app/src/main/res',
     '/mobile/android/services/src/main/res',
     '!res',
 ]
 
 ANDROID_GENERATED_RESFILES += [
     'res/raw/browsersearch.json',
     'res/raw/suggestedsites.json',
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -95,25 +95,16 @@ set_config('MOZ_ANDROID_MOZILLA_ONLINE',
 
 option(env='MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
        help='Build and package the install bouncer APK',
        default=True)
 
 set_config('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
            depends_if('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER')(lambda _: True))
 
-option('--enable-photon', help='Enable Photon skin', default=False)
-
-@depends('--enable-photon')
-def photon_skin(value):
-    if value:
-        return True
-
-set_config('MOZ_ANDROID_PHOTON', photon_skin)
-
 imply_option('MOZ_SOCIAL', False)
 imply_option('MOZ_SERVICES_HEALTHREPORT', True)
 imply_option('MOZ_ANDROID_HISTORY', True)
 
 set_config('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0')
 add_old_configure_assignment('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0')
 
 set_config('ANDROID_GOOGLE_PLAY_SERVICES_VERSION', '8.4.0')