AB2-772-1 Solving build system conflicts

mozilla-release/mobile/android/app/build.gradle

@@ -16,13 +16,6 @@ if (mozconfig.substs.MOZILLA_OFFICIAL) {
     }
 }
 
-/* Cliqz Start */
-def archCode = 3
-    if (mozconfig.substs.CPU_ARCH.toString().equals("x86")) {
-    archCode = 5
-}
-/* Cliqz End */
-
 android {
     compileSdkVersion project.ext.compileSdkVersion
 
@@ -114,59 +107,10 @@ android {
             }
         }
     }
-<<<<<<< .merge_file_hDQ8ea
-    // The "audience" flavour dimension distinguishes between _local_ builds (intended for
-    // development) and _official_ builds (intended for testing in automation and to ship in one of
-    // the Fennec distribution channels).
-    //
-    // The "skin" flavor dimension distinguishes between different user interfaces.  We sometimes
-    // want to develop significant new user interface pieces in-tree that don't ship (even in the
-    // Nightly channel) while under development.  A new "skin" flavour allows us to develop such
-    // pieces in Gradle without changing the mainline configuration.
-
-||||||| .merge_file_vuDt6a
-
-    // The "audience" flavour dimension distinguishes between _local_ builds (intended for
-    // development) and _official_ builds (intended for testing in automation and to ship in one of
-    // the Fennec distribution channels).
-    //
-    // The "skin" flavor dimension distinguishes between different user interfaces.  We sometimes
-    // want to develop significant new user interface pieces in-tree that don't ship (even in the
-    // Nightly channel) while under development.  A new "skin" flavour allows us to develop such
-    // pieces in Gradle without changing the mainline configuration.
-
-=======
-
->>>>>>> .merge_file_fUXF59
     project.configureProductFlavors.delegate = it
     project.configureProductFlavors()
 
-<<<<<<< .merge_file_hDQ8ea
-    flavorDimensions "audience", "geckoBinaries", "minApi", "skin"
-
-    productFlavors {
-        // Since Firefox 57, the mobile user interface has followed the Photon design.
-        // Before Firefox 57, the user interface followed the Australis design.
-        photon {
-            dimension "skin"
-            /* Cliqz start */
-            versionCode android.defaultConfig.versionCode * 100 + 50 + archCode
-            /* Cliqz end */
-        }
-    }
-||||||| .merge_file_vuDt6a
-    flavorDimensions "audience", "geckoBinaries", "minApi", "skin"
-
-    productFlavors {
-        // Since Firefox 57, the mobile user interface has followed the Photon design.
-        // Before Firefox 57, the user interface followed the Australis design.
-        photon {
-            dimension "skin"
-        }
-    }
-=======
     flavorDimensions "geckoBinaries"
->>>>>>> .merge_file_fUXF59
 
     sourceSets {
         main {

mozilla-release/mobile/android/gradle.configure

@@ -351,12 +351,8 @@ option(env='GRADLE_MAVEN_REPOSITORIES',
        # Cliqz start: add jitpack.io
        default=('https://maven.google.com/',
                 'https://jcenter.bintray.com/',
-<<<<<<< .merge_file_dOpqRG
                 'https://jitpack.io',
-||||||| .merge_file_f5fMFG
-=======
                 'https://plugins.gradle.org/m2/',
->>>>>>> .merge_file_QT30PG
        ),
        # Cliqz end
        help='Comma-separated URLs of Maven repositories containing Gradle dependencies.')

mozilla-release/mobile/android/gradle/product_flavors.gradle

@@ -13,52 +13,5 @@ ext.configureProductFlavors = {
         withoutGeckoBinaries {
             dimension "geckoBinaries"
         }
-<<<<<<< .merge_file_uyVZfH
-
-        // For API 21+ - with pre-dexing, this will be faster for local development.
-        minApi21 {
-            dimension "minApi"
-
-            /* Cliqz begin */
-            // Enable multidexing
-            multiDexEnabled true
-            /* Cliqz end */
-
-            // For pre-dexing, setting `minSdkVersion 21` allows the Android gradle plugin to
-            // pre-DEX each module and produce an APK that can be tested on
-            // Android Lollipop without time consuming DEX merging processes.
-            minSdkVersion 21
-            dexOptions {
-                preDexLibraries true
-            }
-        }
-
-        // For API < 21 - does not support pre-dexing because local development
-        // is slow in that case.
-        noMinApi {
-            dimension "minApi"
-        }
-||||||| .merge_file_7b62dI
-
-        // For API 21+ - with pre-dexing, this will be faster for local development.
-        minApi21 {
-            dimension "minApi"
-
-            // For pre-dexing, setting `minSdkVersion 21` allows the Android gradle plugin to
-            // pre-DEX each module and produce an APK that can be tested on
-            // Android Lollipop without time consuming DEX merging processes.
-            minSdkVersion 21
-            dexOptions {
-                preDexLibraries true
-            }
-        }
-
-        // For API < 21 - does not support pre-dexing because local development
-        // is slow in that case.
-        noMinApi {
-            dimension "minApi"
-        }
-=======
->>>>>>> .merge_file_7xJAoI
     }
 }

mozilla-release/toolkit/mozapps/installer/packager.mk

@@ -38,16 +38,11 @@ stage-package: multilocale.txt locale-manifest.in $(MOZ_PKG_MANIFEST) $(MOZ_PKG_
 		$(addprefix --compress ,$(JAR_COMPRESSION)) \
 		$(MOZ_PKG_MANIFEST) '$(DIST)' '$(DIST)'/$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
 		$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
-<<<<<<< .merge_file_ZGyZiX
-	# Cliqz: $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py --warning $(DEFINES) $(ACDEFINES) $(MOZ_PKG_DUPEFLAGS) $(DIST)/$(MOZ_PKG_DIR)
-ifdef MOZ_AUTOMATION
-||||||| .merge_file_fmYV8Z
-ifdef MOZ_AUTOMATION
-=======
-ifdef RUN_FIND_DUPES
->>>>>>> .merge_file_4qS57W
-	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DEFINES) $(ACDEFINES) $(MOZ_PKG_DUPEFLAGS) $(DIST)/$(MOZ_PKG_DIR)
-endif # RUN_FIND_DUPES
+# Cliqz Start - never run find-dupes.py
+# ifdef RUN_FIND_DUPES
+# 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DEFINES) $(ACDEFINES) $(MOZ_PKG_DUPEFLAGS) $(DIST)/$(MOZ_PKG_DIR)
+# endif # RUN_FIND_DUPES
+# Cliqz End
 ifndef MOZ_IS_COMM_TOPDIR
 	# Package mozharness
 	$(call py_action,test_archive, \