Bug 1303468 - Follow-up: Unbust Gradle lint. r=me
authorNick Alexander <nalexander@mozilla.com>
Mon, 19 Sep 2016 14:54:24 -0700
changeset 314506 d00cd0cd33e660837abc9c025153ec8fd2b267a3
parent 314505 6105bfa46e9a23c16dc51b75507680f8e3268607
child 314507 671c2af548b204f1d28bfb3f69beee5931aa12b2
push id81903
push usercbook@mozilla.com
push dateTue, 20 Sep 2016 10:04:26 +0000
treeherdermozilla-inbound@150109898e5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1303468
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1303468 - Follow-up: Unbust Gradle lint. r=me MozReview-Commit-ID: IWB0CMVuNPr
mobile/android/app/build.gradle
mobile/android/thirdparty/build.gradle
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -85,17 +85,16 @@ android {
             manifest.srcFile "${project.buildDir}/generated/source/preprocessed_manifest/AndroidManifest.xml"
 
             aidl {
                 srcDir "${topsrcdir}/mobile/android/base/aidl"
             }
 
             java {
                 srcDir "${topsrcdir}/mobile/android/geckoview/src/main/java"
-                srcDir "${topsrcdir}/mobile/android/geckoview/src/thirdparty/java"
                 srcDir "${topsrcdir}/mobile/android/base/java"
                 srcDir "${topsrcdir}/mobile/android/search/java"
                 srcDir "${topsrcdir}/mobile/android/javaaddons/java"
                 srcDir "${topsrcdir}/mobile/android/services/src/main/java"
 
                 if (mozconfig.substs.MOZ_ANDROID_MLS_STUMBLER) {
                     srcDir "${topsrcdir}/mobile/android/stumbler/java"
                 }
--- a/mobile/android/thirdparty/build.gradle
+++ b/mobile/android/thirdparty/build.gradle
@@ -20,16 +20,18 @@ android {
         abortOnError false
     }
 
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java {
                 srcDir '.'
+                srcDir "${topsrcdir}/mobile/android/geckoview/src/thirdparty/java"
+
                 if (!mozconfig.substs.MOZ_INSTALL_TRACKING) {
                     exclude 'com/adjust/**'
                 }
 
                 // Exclude LeakCanary: It will be added again via a gradle dependency. This version
                 // here is only the no-op library for mach-based builds.
                 exclude 'com/squareup/leakcanary/**'
             }