Use local copy of guava

Keeps the version in sync for LiveTv and makes it a soong dep

Change-Id: Id7b6092638553416681fc24d3ba3c91835e40100
Test: m LiveTv

3 files changed, 13 insertions, 0 deletions

diff --git a/libs/Android.bp b/libs/Android.bp
index 03089208..017f2022 100644
--- a/libs/Android.bp
+++ b/libs/Android.bp
@@ -12,6 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+java_import {
+    name: "guava-jre-jar",
+    jars: ["guava-23.3-jre.jar"],
+    host_supported: true,
+    sdk_version: "current",
+}
+
+java_import {
+    name: "guava-android-jar",
+    jars: ["guava-23.6-android.jar"],
+    sdk_version: "current",
+}
+
 android_library_import {
     name: "lib-exoplayer",
     aars: ["exoplayer-r1.5.16.aar"],
diff --git a/libs/guava-23.5-jre.jar b/libs/guava-23.5-jre.jar
new file mode 100644
index 00000000..7e5f13a8
--- /dev/null
+++ b/libs/guava-23.5-jre.jar
diff --git a/libs/guava-23.6-android.jar b/libs/guava-23.6-android.jar
new file mode 100644
index 00000000..01180d23
--- /dev/null
+++ b/libs/guava-23.6-android.jar