nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1828719 - Remove omnijar Gradle project from srcdir r=geckoview-reviewers,nalexander,amejiamarmol

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D175790
This commit is contained in:
Gabriel Luong 2023-04-18 23:20:43 +00:00
parent cd10d90126
commit 45e8c44ba3
2 changed files with 0 additions and 36 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

34
mobile/android/app/omnijar/build.gradle
View file

@ -1,34 +0,0 @@
buildDir "${topobjdir}/gradle/build/mobile/android/omnijar"
apply plugin: 'java'
// This project is a dummy project; the JAR produced is not used. The root
// project uses the set of inputs here to check if the omnijar needs to be
// rebuilt. By listing them here as resource directories, IntelliJ labels each
// checked directly nicely. Why list the directories here? There's a mismatch
// between SourceDirectorySet and TaskInputs: the former is directory oriented,
// while the latter is more general. That means its easy to convert this list
// into inputs for the root project, but not vice-versa. Sadly this would mean
// that the root project evaluation depends on :omnijar, so we duplicate in the
// root project.
sourceSets {
main {
// These are supposed to be files that go into the omnijar. But yes,
// toolkit/ has lots of native code.
resources {
srcDir "${topsrcdir}/mobile/android/chrome"
srcDir "${topsrcdir}/mobile/android/components"
srcDir "${topsrcdir}/mobile/android/locales"
srcDir "${topsrcdir}/mobile/android/modules"
srcDir "${topsrcdir}/mobile/android/themes"
srcDir "${topsrcdir}/toolkit"
}
}
}
apply plugin: 'idea'
idea {
module {
}
}

2
settings.gradle
View file

@ -55,14 +55,12 @@ include ':geckoview'
include ':geckoview_example'
include ':test_runner'
include ':exoplayer2'
include ':omnijar'
project(':annotations').projectDir = new File("${json.topsrcdir}/mobile/android/annotations")
project(':geckoview').projectDir = new File("${json.topsrcdir}/mobile/android/geckoview")
project(':geckoview_example').projectDir = new File("${json.topsrcdir}/mobile/android/geckoview_example")
project(':test_runner').projectDir = new File("${json.topsrcdir}/mobile/android/test_runner")
project(':exoplayer2').projectDir = new File("${json.topsrcdir}/mobile/android/exoplayer2")
project(':omnijar').projectDir = new File("${json.topsrcdir}/mobile/android/app/omnijar")
if (hasProperty("androidFormatLintTest")) {
include ':androidFormatLintTest'