wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1228430 - Move build.gradle out of mobile/android/base. r=me

Browse Source 
DONTBUILD NPOTB
This commit is contained in:
Nick Alexander 2015-11-26 13:02:00 -08:00
parent 43fd33850b
commit 2ad8c85d46
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/android/base/build.gradle → mobile/android/app/base/build.gradle
View File

@ -24,10 +24,10 @@ android {
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
manifest.srcFile "${topsrcdir}/mobile/android/base/AndroidManifest.xml"
java {
srcDir "${topobjdir}/gradle/base/src"
exclude 'org/mozilla/gecko/resources/**'
srcDir "${topsrcdir}/mobile/android/search/java"
srcDir "${topsrcdir}/mobile/android/javaaddons/java"
@ -64,9 +64,9 @@ android {
res {
srcDir "${topsrcdir}/${mozconfig.substs.MOZ_BRANDING_DIRECTORY}/res"
srcDir "${project.buildDir}/generated/source/preprocessed_resources" // See syncPreprocessedResources.
srcDir 'resources'
srcDir "${topsrcdir}/mobile/android/base/resources"
if (mozconfig.substs.MOZ_CRASHREPORTER) {
srcDir 'crashreporter/res'
srcDir "${topsrcdir}/mobile/android/base/crashreporter/res"
}
}
}

2
settings.gradle
View File

@ -46,7 +46,7 @@ include ':omnijar'
include ':thirdparty'
project(':app').projectDir = new File("${json.topsrcdir}/mobile/android/app")
project(':base').projectDir = new File("${json.topsrcdir}/mobile/android/base")
project(':base').projectDir = new File("${json.topsrcdir}/mobile/android/app/base")
project(':omnijar').projectDir = new File("${json.topsrcdir}/mobile/android/app/omnijar")
project(':thirdparty').projectDir = new File("${json.topsrcdir}/mobile/android/thirdparty")