зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1249421 - Include stub AndroidManifest.xml. r=maliu
This should avoid Bug 1249421, but it will also address an Android-Gradle plugin 3.0 issue, where the plugin requires the manifest at Gradle configuration time. Currently we don't provide it until Gradle evaluation time, leading to this error, and to the plugin failing. MozReview-Commit-ID: 4NkiQSooLly --HG-- extra : rebase_source : 21b11e8cb4ff990df3adf18718ec3bda869486a0
This commit is contained in:
Родитель
2f7ae795af
Коммит
5b055513a7
|
@ -116,8 +116,6 @@ android {
|
|||
|
||||
sourceSets {
|
||||
main {
|
||||
manifest.srcFile "${project.buildDir}/generated/source/preprocessed_manifest/AndroidManifest.xml"
|
||||
|
||||
aidl {
|
||||
srcDir "${topsrcdir}/mobile/android/base/aidl"
|
||||
}
|
||||
|
@ -179,6 +177,18 @@ android {
|
|||
}
|
||||
}
|
||||
|
||||
// Every configuration needs the stub manifest at
|
||||
// src/main/AndroidManifest.xml and the generated manifest. We can't
|
||||
// use the main sourceSet without losing the stub, so we cover all the
|
||||
// configurations by enumerating the buildTypes here.
|
||||
debug {
|
||||
manifest.srcFile "${project.buildDir}/generated/source/preprocessed_manifest/AndroidManifest.xml"
|
||||
}
|
||||
|
||||
release {
|
||||
manifest.srcFile "${project.buildDir}/generated/source/preprocessed_manifest/AndroidManifest.xml"
|
||||
}
|
||||
|
||||
test {
|
||||
java {
|
||||
srcDir "${topsrcdir}/mobile/android/tests/background/junit4/src"
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This is not the real manifest; it's a stub to satisfy the
|
||||
Android-Gradle plugin. The real manifest is generated from
|
||||
mobile/android/base/AndroidManifest.xml.in. -->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.gecko">
|
||||
</manifest>
|
Загрузка…
Ссылка в новой задаче