Move fenix to the full megazord. Fixes #1466

.buildconfig-android.yml

@@ -91,13 +91,3 @@ projects:
       - name: full-megazord-forUnitTests
         type: jar
     description: Megazord containing all features
-  fenix-megazord:
-    uploadSymbols: true
-    path: megazords/fenix/android
-    artifactId: fenix-megazord
-    publications:
-      - name: fenix-megazord
-        type: aar
-      - name: fenix-megazord-forUnitTests
-        type: jar
-    description: Megazord of [fxaclient, places, push, logging].

.circleci/config.yml

@@ -164,8 +164,6 @@ commands:
             python3 ./tools/dependency_summary.py --all-ios-targets --package megazord_ios --check megazords/ios/DEPENDENCIES.md
             python3 ./tools/dependency_summary.py --all-android-targets --package megazord --check megazords/full/DEPENDENCIES.md
             python3 ./tools/dependency_summary.py --all-android-targets --package megazord --format pom --check megazords/full/android/dependency-licenses.xml
-            python3 ./tools/dependency_summary.py --all-android-targets --package fenix --check megazords/fenix/DEPENDENCIES.md
-            python3 ./tools/dependency_summary.py --all-android-targets --package fenix --format pom --check megazords/fenix/android/dependency-licenses.xml
             python3 ./tools/dependency_summary.py --all-android-targets --package lockbox --check megazords/lockbox/DEPENDENCIES.md
             python3 ./tools/dependency_summary.py --all-android-targets --package lockbox --format pom --check megazords/lockbox/android/dependency-licenses.xml
 

Cargo.lock

@@ -644,19 +644,6 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
-[[package]]
-name = "fenix"
-version = "0.1.0"
-dependencies = [
- "fxaclient_ffi",
- "logins_ffi",
- "places-ffi",
- "push-ffi",
- "rc_log_ffi",
- "sync_manager_ffi",
- "viaduct",
-]
-
 [[package]]
 name = "ffi-support"
 version = "0.4.0"

Cargo.toml

@@ -28,7 +28,6 @@ members = [
     "components/tabs",
     "components/tabs/ffi",
     "components/viaduct",
-    "megazords/fenix",
     "megazords/full",
     "megazords/ios/rust",
     "megazords/lockbox",

docs/product-portal/applications/consuming-megazord-libraries.md

@@ -89,7 +89,6 @@ to fit the needs of existing Firefox applications:
 | Name | Components | Maven publication |
 | --- | --- | --- |
 | `lockbox` | `fxaclient`, `logins` | `org.mozilla.appservices:lockbox-megazord` |
-| `fenix` | `fxaclient`, `logins`, `places` | `org.mozilla.appservices:fenix-megazord` |
 
 Then, simply use gradle's builtin support for [module replacement](https://docs.gradle.org/current/userguide/customizing_dependency_resolution_behavior.html#sec:module_replacement)
 to replace the default "full megazord" with your selected custom build:
@@ -98,7 +97,7 @@ to replace the default "full megazord" with your selected custom build:
 dependencies {
   modules {
     module('org.mozilla.appservices:full-megazord') {
-      replacedBy('org.mozilla.appservices:fenix-megazord', 'prefer the fenix megazord, to reduce final application size')
+      replacedBy('org.mozilla.appservices:lockbox-megazord', 'prefer the lockbox megazord, to reduce final application size')
     }
   }
 }
@@ -126,7 +125,7 @@ Or, if you are using a custom megazord library, like this:
 
 ```groovy
 dependencies {
-  testImplementation "org.mozilla.appservices:fenix-megazord-forUnitTests:X.Y.Z"
+  testImplementation "org.mozilla.appservices:lockbox-megazord-forUnitTests:X.Y.Z"
 }
 ```
 

megazords/fenix/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "fenix"
-edition = "2018"
-version = "0.1.0"
-authors = ["application-services <application-services@mozilla.com>"]
-license = "MPL-2.0"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-fxaclient_ffi = { path = "../../components/fxa-client/ffi" }
-logins_ffi = { path = "../../components/logins/ffi" }
-places-ffi = { path = "../../components/places/ffi" }
-push-ffi = { path = "../../components/push/ffi" }
-rc_log_ffi = { path = "../../components/rc_log" }
-viaduct = { path = "../../components/viaduct", default-features = false }
-sync_manager_ffi = { path = "../../components/sync_manager/ffi" }

megazords/fenix/android/build.gradle

@@ -1,101 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-android {
-    compileSdkVersion rootProject.ext.build.compileSdkVersion
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.build['minSdkVersion']
-        targetSdkVersion rootProject.ext.build['targetSdkVersion']
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        buildConfigField("String", "LIBRARY_VERSION", "\"${rootProject.ext.library.version}\"")
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            consumerProguardFiles "$rootDir/proguard-rules-consumer-jna.pro"
-        }
-    }
-
-    sourceSets {
-        test.jniLibs.srcDirs += "$buildDir/rustJniLibs/desktop"
-    }
-
-    // Uncomment to include debug symbols in native library builds.
-    // packagingOptions { doNotStrip "**/*.so" }
-}
-
-afterEvaluate {
-    android.sourceSets.debug.jniLibs.srcDirs = android.sourceSets.main.jniLibs.srcDirs
-    android.sourceSets.release.jniLibs.srcDirs = android.sourceSets.main.jniLibs.srcDirs
-}
-
-configurations {
-    // There's an interaction between Gradle's resolution of dependencies with different types
-    // (@jar, @aar) for `implementation` and `testImplementation` and with Android Studio's built-in
-    // JUnit test runner.  The runtime classpath in the built-in JUnit test runner gets the
-    // dependency from the `implementation`, which is type @aar, and therefore the JNA dependency
-    // doesn't provide the JNI dispatch libraries in the correct Java resource directories.  I think
-    // what's happening is that @aar type in `implementation` resolves to the @jar type in
-    // `testImplementation`, and that it wins the dependency resolution battle.
-    //
-    // A workaround is to add a new configuration which depends on the @jar type and to reference
-    // the underlying JAR file directly in `testImplementation`.  This JAR file doesn't resolve to
-    // the @aar type in `implementation`.  This works when invoked via `gradle`, but also sets the
-    // correct runtime classpath when invoked with Android Studio's built-in JUnit test runner.
-    // Success!
-    jnaForTest
-}
-
-cargo {
-    // The directory of the Cargo.toml to build.
-    module = '..'
-
-    // The Android NDK API level to target.
-    apiLevel = 21
-
-    // Where Cargo writes its outputs.
-    targetDirectory = '../../../target'
-
-    libname = 'fenix'
-
-    // The Cargo targets to invoke.  The mapping from short name to target
-    // triple is defined by the `rust-android-gradle` plugin.
-    targets = rootProject.ext.rustTargets
-
-    // Perform release builds (which should have debug info, due to
-    // `debug = true` in Cargo.toml).
-    profile = "release"
-
-    extraCargoBuildArguments = rootProject.ext.extraCargoBuildArguments
-
-    exec = rootProject.ext.cargoExecWithSQLCipher
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    jnaForTest "net.java.dev.jna:jna:$jna_version@jar"
-}
-
-afterEvaluate {
-    // The `cargoBuild` task isn't available until after evaluation.
-    android.libraryVariants.all { variant ->
-        def productFlavor = ""
-        variant.productFlavors.each {
-            productFlavor += "${it.name.capitalize()}"
-        }
-        def buildType = "${variant.buildType.name.capitalize()}"
-        tasks["generate${productFlavor}${buildType}Assets"].dependsOn(tasks["cargoBuild"])
-    }
-}
-
-apply from: "$rootDir/publish.gradle"
-ext.configurePublish(
-        /* jnaForTestConfiguration= */ configurations.jnaForTest,
-)

megazords/fenix/android/dependency-licenses.xml

@@ -1,443 +0,0 @@
-<licenses>
-<!--
-Binary distributions of this software incorporate code from a number of third-party dependencies.
-These dependencies are available under a variety of free and open source licenses,
-the details of which are reproduced below.
--->
-  <license>
-    <name>Mozilla Public License 2.0: NSPR</name>
-    <url>https://hg.mozilla.org/projects/nspr/raw-file/tip/LICENSE</url>
-  </license>
-  <license>
-    <name>Mozilla Public License 2.0: NSS</name>
-    <url>https://hg.mozilla.org/projects/nss/raw-file/tip/COPYING</url>
-  </license>
-  <license>
-    <name>Mozilla Public License 2.0: ece</name>
-    <url>https://github.com/mozilla/rust-ece/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>Mozilla Public License 2.0: hawk</name>
-    <url>https://github.com/taskcluster/rust-hawk/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: anyhow</name>
-    <url>https://github.com/dtolnay/anyhow/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: autocfg</name>
-    <url>https://github.com/cuviper/autocfg/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: backtrace</name>
-    <url>https://github.com/rust-lang/backtrace-rs/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: backtrace-sys</name>
-    <url>https://github.com/rust-lang/backtrace-rs/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: base64</name>
-    <url>https://github.com/alicemaz/rust-base64/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: base64</name>
-    <url>https://github.com/marshallpierce/rust-base64/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: bitflags</name>
-    <url>https://github.com/bitflags/bitflags/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: c2-chacha</name>
-    <url>https://github.com/cryptocorrosion/cryptocorrosion/blob/master/stream-ciphers/chacha/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: cc</name>
-    <url>https://github.com/alexcrichton/cc-rs/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: cexpr</name>
-    <url>https://github.com/jethrogb/rust-cexpr/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: cfg-if</name>
-    <url>https://github.com/alexcrichton/cfg-if/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: clang-sys</name>
-    <url>https://github.com/KyleMayes/clang-sys/blob/master/LICENSE.txt</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: dogear</name>
-    <url>https://github.com/mozilla/dogear/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: either</name>
-    <url>https://github.com/bluss/either/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: env_logger</name>
-    <url>https://github.com/sebasmagri/env_logger/blob//master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: failure</name>
-    <url>https://github.com/rust-lang-nursery/failure/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: failure_derive</name>
-    <url>https://github.com/withoutboats/failure_derive/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: fallible-iterator</name>
-    <url>https://github.com/sfackler/rust-fallible-iterator/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: fallible-streaming-iterator</name>
-    <url>https://github.com/sfackler/fallible-streaming-iterator/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: fixedbitset</name>
-    <url>https://github.com/bluss/fixedbitset/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: getrandom</name>
-    <url>https://github.com/rust-random/getrandom/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: glob</name>
-    <url>https://github.com/rust-lang/glob/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: heck</name>
-    <url>https://github.com/withoutboats/heck/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: hex</name>
-    <url>https://github.com/KokaKiwi/rust-hex/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: humantime</name>
-    <url>https://github.com/tailhook/humantime/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: idna</name>
-    <url>https://github.com/servo/rust-url/blob//master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: indexmap</name>
-    <url>https://github.com/bluss/indexmap/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: itertools</name>
-    <url>https://github.com/bluss/rust-itertools/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: itoa</name>
-    <url>https://github.com/dtolnay/itoa/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: jna</name>
-    <url>https://github.com/java-native-access/jna/blob/master/AL2.0</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: lazy_static</name>
-    <url>https://github.com/rust-lang-nursery/lazy-static.rs/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: lazycell</name>
-    <url>https://github.com/indiv0/lazycell/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: libc</name>
-    <url>https://github.com/rust-lang/libc/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: linked-hash-map</name>
-    <url>https://github.com/contain-rs/linked-hash-map/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: log</name>
-    <url>https://github.com/rust-lang/log/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: lru-cache</name>
-    <url>https://github.com/contain-rs/lru-cache/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: multimap</name>
-    <url>https://github.com/havarnov/multimap/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: once_cell</name>
-    <url>https://github.com/matklad/once_cell/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: peeking_take_while</name>
-    <url>https://github.com/fitzgen/peeking_take_while/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: percent-encoding</name>
-    <url>https://github.com/servo/rust-url/blob//master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: petgraph</name>
-    <url>https://github.com/petgraph/petgraph/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: pkg-config</name>
-    <url>https://github.com/rust-lang/pkg-config-rs/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: ppv-lite86</name>
-    <url>https://github.com/cryptocorrosion/cryptocorrosion/blob/master/utils-simd/ppv-lite86/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: proc-macro2</name>
-    <url>https://github.com/alexcrichton/proc-macro2/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: prost</name>
-    <url>https://github.com/danburkert/prost/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: prost-build</name>
-    <url>https://github.com/danburkert/prost/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: prost-derive</name>
-    <url>https://github.com/danburkert/prost/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: prost-types</name>
-    <url>https://github.com/danburkert/prost/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: quick-error</name>
-    <url>https://github.com/tailhook/quick-error/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: quote</name>
-    <url>https://github.com/dtolnay/quote/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: rand</name>
-    <url>https://github.com/rust-random/rand/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: rand_chacha</name>
-    <url>https://github.com/rust-random/rand/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: rand_core</name>
-    <url>https://github.com/rust-random/rand/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: regex</name>
-    <url>https://github.com/rust-lang/regex/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: regex-syntax</name>
-    <url>https://github.com/rust-lang/regex/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: remove_dir_all</name>
-    <url>https://github.com/XAMPPRocky/remove_dir_all/blob/master/LICENCE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: rustc-demangle</name>
-    <url>https://github.com/alexcrichton/rustc-demangle/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: rustc-hash</name>
-    <url>https://github.com/rust-lang-nursery/rustc-hash/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: ryu</name>
-    <url>https://github.com/dtolnay/ryu/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: serde</name>
-    <url>https://github.com/serde-rs/serde/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: serde_derive</name>
-    <url>https://github.com/serde-rs/serde/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: serde_json</name>
-    <url>https://github.com/serde-rs/json/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: shlex</name>
-    <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: smallbitvec</name>
-    <url>https://github.com/servo/smallbitvec/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: smallvec</name>
-    <url>https://github.com/servo/rust-smallvec/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: syn</name>
-    <url>https://github.com/dtolnay/syn/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: tempfile</name>
-    <url>https://github.com/Stebalien/tempfile/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: thread_local</name>
-    <url>https://github.com/Amanieu/thread_local-rs/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: time</name>
-    <url>https://github.com/time-rs/time/blob/master/LICENSE-Apache</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: toml</name>
-    <url>https://github.com/alexcrichton/toml-rs/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: unicode-bidi</name>
-    <url>https://github.com/servo/unicode-bidi/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: unicode-normalization</name>
-    <url>https://github.com/unicode-rs/unicode-normalization/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: unicode-segmentation</name>
-    <url>https://github.com/unicode-rs/unicode-segmentation/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: unicode-width</name>
-    <url>https://github.com/unicode-rs/unicode-width/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: unicode-xid</name>
-    <url>https://github.com/unicode-rs/unicode-xid/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: url</name>
-    <url>https://github.com/servo/rust-url/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: vec_map</name>
-    <url>https://github.com/contain-rs/vec-map/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: version_check</name>
-    <url>https://github.com/SergioBenitez/version_check/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: winapi</name>
-    <url>https://github.com/retep998/winapi-rs/blob/master/LICENSE-MIT</url>
-  </license>
-  <license>
-    <name>Apache License 2.0: winapi-x86_64-pc-windows-gnu</name>
-    <url>https://github.com/retep998/winapi-rs/blob/master/LICENSE-APACHE</url>
-  </license>
-  <license>
-    <name>MIT License: aho-corasick</name>
-    <url>https://github.com/BurntSushi/aho-corasick/blob/master/LICENSE-MIT</url>
-  </license>
-  <license>
-    <name>MIT License: byteorder</name>
-    <url>https://github.com/BurntSushi/byteorder/blob/master/LICENSE-MIT</url>
-  </license>
-  <license>
-    <name>MIT License: memchr</name>
-    <url>https://github.com/BurntSushi/rust-memchr/blob/master/LICENSE-MIT</url>
-  </license>
-  <license>
-    <name>MIT License: termcolor</name>
-    <url>https://github.com/BurntSushi/termcolor/blob/master/LICENSE-MIT</url>
-  </license>
-  <license>
-    <name>MIT License: ansi_term</name>
-    <url>https://github.com/ogham/rust-ansi-term/blob/master/LICENCE</url>
-  </license>
-  <license>
-    <name>MIT License: atty</name>
-    <url>https://github.com/softprops/atty/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: bincode</name>
-    <url>https://github.com/servo/bincode/blob/master/LICENSE.md</url>
-  </license>
-  <license>
-    <name>MIT License: bytes</name>
-    <url>https://github.com/tokio-rs/bytes/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: caseless</name>
-    <url>https://github.com/SimonSapin/rust-caseless/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: clap</name>
-    <url>https://github.com/clap-rs/clap/blob/master/LICENSE-MIT</url>
-  </license>
-  <license>
-    <name>MIT License: libsqlite3-sys</name>
-    <url>https://github.com/jgallagher/rusqlite/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: rusqlite</name>
-    <url>https://github.com/jgallagher/rusqlite/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: matches</name>
-    <url>https://github.com/SimonSapin/rust-std-candidates/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: nom</name>
-    <url>https://github.com/Geal/nom/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: strsim</name>
-    <url>https://github.com/dguo/strsim-rs/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: synstructure</name>
-    <url>https://github.com/mystor/synstructure/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: textwrap</name>
-    <url>https://github.com/mgeisler/textwrap/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>MIT License: which</name>
-    <url>https://github.com/harryfei/which-rs/blob/master/LICENSE.txt</url>
-  </license>
-  <license>
-    <name>CC0-1.0 License: base16</name>
-    <url>https://github.com/thomcc/rust-base16/blob/master/LICENSE-CC0</url>
-  </license>
-  <license>
-    <name>ISC License: libloading</name>
-    <url>https://github.com/nagisa/rust_libloading/blob//master/LICENSE</url>
-  </license>
-  <license>
-    <name>ISC License: ring</name>
-    <url>https://github.com/briansmith/ring/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>BSD-3-Clause License: bindgen</name>
-    <url>https://github.com/rust-lang/rust-bindgen/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>BSD-3-Clause License: protobuf</name>
-    <url>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>BSD-3-Clause License: sqlcipher</name>
-    <url>https://github.com/sqlcipher/sqlcipher/blob/master/LICENSE</url>
-  </license>
-  <license>
-    <name>Optional Notice: SQLite</name>
-    <url>https://sqlite.org/copyright.html</url>
-  </license>
-</licenses>

megazords/fenix/android/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.appservices.fenix_megazord" />

megazords/fenix/android/src/main/java/mozilla/appservices/Megazord.kt

@@ -1,17 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package mozilla.appservices
-
-import org.mozilla.appservices.fenix_megazord.BuildConfig
-
-class Megazord {
-    companion object {
-        @JvmStatic
-        fun init() {
-            System.setProperty("mozilla.appservices.megazord.library", "fenix")
-            System.setProperty("mozilla.appservices.megazord.version", BuildConfig.LIBRARY_VERSION)
-        }
-    }
-}

megazords/fenix/src/lib.rs

@@ -1,14 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#![allow(unknown_lints)]
-#![warn(rust_2018_idioms)]
-
-pub use fxaclient_ffi;
-pub use logins_ffi;
-pub use places_ffi;
-pub use push_ffi;
-pub use rc_log_ffi;
-pub use sync_manager_ffi;
-pub use viaduct;

tools/regenerate_dependency_summaries.sh

@@ -9,8 +9,5 @@ python3 ./tools/dependency_summary.py --all-ios-targets --package megazord_ios >
 python3 ./tools/dependency_summary.py --all-android-targets --package megazord > megazords/full/DEPENDENCIES.md
 python3 ./tools/dependency_summary.py --all-android-targets --package megazord --format pom > megazords/full/android/dependency-licenses.xml
 
-python3 ./tools/dependency_summary.py --all-android-targets --package fenix > megazords/fenix/DEPENDENCIES.md
-python3 ./tools/dependency_summary.py --all-android-targets --package fenix --format pom > megazords/fenix/android/dependency-licenses.xml
-
 python3 ./tools/dependency_summary.py --all-android-targets --package lockbox > megazords/lockbox/DEPENDENCIES.md
 python3 ./tools/dependency_summary.py --all-android-targets --package lockbox --format pom > megazords/lockbox/android/dependency-licenses.xml