From 590edf5288ca734d102bbb536daa5be1bc22a5af Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 7 May 2018 11:06:18 -0700
Subject: [PATCH] Fix checker-framework build issues

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=195689456
---
 checker-framework-lint.xml           | 19 +++++++++++++++++++
 library/core/build.gradle            |  4 ++++
 library/core/proguard-rules.txt      |  3 +++
 library/dash/build.gradle            |  4 ++++
 library/hls/build.gradle             |  4 ++++
 library/smoothstreaming/build.gradle |  4 ++++
 6 files changed, 38 insertions(+)
 create mode 100644 checker-framework-lint.xml

diff --git a/checker-framework-lint.xml b/checker-framework-lint.xml
new file mode 100644
index 0000000000..1d45f9de05
--- /dev/null
+++ b/checker-framework-lint.xml
@@ -0,0 +1,19 @@
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<lint>
+  <issue id="InvalidPackage">
+    <ignore path="**/checker-qual-*.jar"/>
+  </issue>
+</lint>
diff --git a/library/core/build.gradle b/library/core/build.gradle
index 14aeedfd3c..52249220e0 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -42,6 +42,10 @@ android {
         //    testCoverageEnabled = true
         // }
     }
+
+    lintOptions {
+        lintConfig file("../../checker-framework-lint.xml")
+    }
 }
 
 dependencies {
diff --git a/library/core/proguard-rules.txt b/library/core/proguard-rules.txt
index 7dc81c3f73..fe204822a8 100644
--- a/library/core/proguard-rules.txt
+++ b/library/core/proguard-rules.txt
@@ -29,3 +29,6 @@
 -keepclassmembers class com.google.android.exoplayer2.ext.rtmp.RtmpDataSource {
   <init>();
 }
+
+# Don't warn about checkerframework
+-dontwarn org.checkerframework.**
diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index b9fb3a63cc..81b247d047 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -30,6 +30,10 @@ android {
         //    testCoverageEnabled = true
         // }
     }
+
+    lintOptions {
+        lintConfig file("../../checker-framework-lint.xml")
+    }
 }
 
 dependencies {
diff --git a/library/hls/build.gradle b/library/hls/build.gradle
index 87115a0712..c599931a68 100644
--- a/library/hls/build.gradle
+++ b/library/hls/build.gradle
@@ -30,6 +30,10 @@ android {
         //    testCoverageEnabled = true
         // }
     }
+
+    lintOptions {
+        lintConfig file("../../checker-framework-lint.xml")
+    }
 }
 
 dependencies {
diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle
index e83a7df81a..e71f9baa99 100644
--- a/library/smoothstreaming/build.gradle
+++ b/library/smoothstreaming/build.gradle
@@ -30,6 +30,10 @@ android {
         //    testCoverageEnabled = true
         // }
     }
+
+    lintOptions {
+        lintConfig file("../../checker-framework-lint.xml")
+    }
 }
 
 dependencies {