Bug 1372486 - Part 3: Support mach/gradle build for Photon with its resources. r=nalexander,nechen

MozReview-Commit-ID: DMzYPgzcEq2

--HG--
extra : rebase_source : 47ed1cd60432d2d1c8fd8263d526c82fc6dd9e1b

mobile/android/base/moz.build

@@ -1370,6 +1370,18 @@ if CONFIG['MOZ_ANDROID_MMA']:
 # 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',

mobile/android/moz.configure

@@ -100,6 +100,15 @@ option(env='MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
 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)