Remove the (now redundant) reference-browser-megazord
This commit is contained in:
Thom Chiovoloni
Родитель
3d144a3023
Коммит
463c46d4db
|
|
@ -53,12 +53,6 @@ projects:
|
|||
artifactId: lockbox-megazord
|
||||
publishedArtifacts: [lockbox-megazord, lockbox-megazord-forUnitTests]
|
||||
description: Megazord of [fxaclient, logins, logging].
|
||||
reference-browser-megazord:
|
||||
uploadSymbols: true
|
||||
path: megazords/reference-browser/android
|
||||
artifactId: reference-browser-megazord
|
||||
publishedArtifacts: [reference-browser-megazord, reference-browser-megazord-forUnitTests]
|
||||
description: Megazord of [fxaclient, logins, places, push, logging].
|
||||
fenix-megazord:
|
||||
uploadSymbols: true
|
||||
path: megazords/fenix/android
|
||||
|
|
|
|||
|
|
@ -1931,18 +1931,6 @@ dependencies = [
|
|||
"redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "reference-browser"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"fxaclient_ffi 0.1.0",
|
||||
"logins_ffi 0.1.0",
|
||||
"places-ffi 0.1.0",
|
||||
"push-ffi 0.1.0",
|
||||
"rc_log_ffi 0.1.0",
|
||||
"viaduct 0.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.1.6"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ members = [
|
|||
"megazords/fenix",
|
||||
"megazords/full",
|
||||
"megazords/lockbox",
|
||||
"megazords/reference-browser",
|
||||
"megazords/ios/rust",
|
||||
"testing/sync-test",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
[package]
|
||||
name = "reference-browser"
|
||||
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" }
|
||||
|
|
@ -1,103 +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
|
||||
// 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 = 'reference_browser'
|
||||
|
||||
// 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"
|
||||
|
||||
exec = rootProject.ext.cargoExecWithSQLCipher
|
||||
|
||||
extraCargoBuildArguments = rootProject.ext.extraCargoBuildArguments
|
||||
}
|
||||
|
||||
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,
|
||||
)
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mozilla.appservices.reference_browser_megazord" />
|
||||
|
|
@ -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.reference_browser_megazord.BuildConfig
|
||||
|
||||
class Megazord {
|
||||
companion object {
|
||||
@JvmStatic
|
||||
fun init() {
|
||||
System.setProperty("mozilla.appservices.megazord.library", "reference_browser")
|
||||
System.setProperty("mozilla.appservices.megazord.version", BuildConfig.LIBRARY_VERSION)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +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 viaduct;
|
||||
Загрузка…
Ссылка в новой задаче