Cleanup gif decoder build.

7 files changed, 10 insertions, 125 deletions

diff --git a/third_party/gif_decoder/.gitignore b/third_party/gif_decoder/.gitignore
deleted file mode 100644
index 8c5b3448..00000000
--- a/third_party/gif_decoder/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-local.properties
-bin/**/*
-gen/**/*
-target/**/*
diff --git a/third_party/gif_decoder/AndroidManifest.xml b/third_party/gif_decoder/AndroidManifest.xml
deleted file mode 100644
index 03f0e112..00000000
--- a/third_party/gif_decoder/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bumptech.glide.gifdecoder"
-          android:versionCode="1"
-          android:versionName="1.0.0" >
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="19" />
-  <application />
-</manifest>
diff --git a/third_party/gif_decoder/build.gradle b/third_party/gif_decoder/build.gradle
index 52efdf6e..c5575692 100644
--- a/third_party/gif_decoder/build.gradle
+++ b/third_party/gif_decoder/build.gradle
@@ -3,10 +3,10 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 19
     buildToolsVersion = '19.1.0'
-    sourceSets {
-        main {
-            java.srcDirs         = ['src/main/java']
-            manifest.srcFile 'AndroidManifest.xml'
-        }
+
+    defaultConfig {
+        applicationId 'com.bumptech.glide.gifdecoder'
+        minSdkVersion 10
+        targetSdkVersion 19
     }
 }
diff --git a/third_party/gif_decoder/build.xml b/third_party/gif_decoder/build.xml
deleted file mode 100644
index a6e9e003..00000000
--- a/third_party/gif_decoder/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="glide" default="help">
-
-  <!-- The local.properties file is created and updated by the 'android' tool.
-       It contains the path to the SDK. It should *NOT* be checked into
-       Version Control Systems. -->
-  <property file="local.properties"/>
-
-  <!-- The ant.properties file can be created by you. It is only edited by the
-       'android' tool to add properties to it.
-       This is the place to change some Ant specific build properties.
-       Here are some properties you may want to change/update:
-
-       source.dir
-           The name of the source directory. Default is 'src'.
-       out.dir
-           The name of the output directory. Default is 'bin'.
-
-       For other overridable properties, look at the beginning of the rules
-       files in the SDK, at tools/ant/build.xml
-
-       Properties related to the SDK location or the project target should
-       be updated using the 'android' tool with the 'update' action.
-
-       This file is an integral part of the build system for your
-       application and should be checked into Version Control Systems.
-
-       -->
-  <property file="ant.properties"/>
-
-  <!-- if sdk.dir was not set from one of the property file, then
-       get it from the ANDROID_HOME env var.
-       This must be done before we load project.properties since
-       the proguard config can use sdk.dir -->
-  <property environment="env"/>
-  <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-    <isset property="env.ANDROID_HOME"/>
-  </condition>
-
-  <!-- The project.properties file is created and updated by the 'android'
-       tool, as well as ADT.
-
-       This contains project specific properties such as project target, and library
-       dependencies. Lower level build properties are stored in ant.properties
-       (or in .classpath for Eclipse projects).
-
-       This file is an integral part of the build system for your
-       application and should be checked into Version Control Systems. -->
-  <loadproperties srcFile="project.properties"/>
-
-  <!-- quick check on sdk.dir -->
-  <fail
-    message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-    unless="sdk.dir"
-    />
-
-  <!--
-      Import per project custom build rules if present at the root of the project.
-      This is the place to put custom intermediary targets such as:
-          -pre-build
-          -pre-compile
-          -post-compile (This is typically used for code obfuscation.
-                         Compiled code location: ${out.classes.absolute.dir}
-                         If this is not done in place, override ${out.dex.input.absolute.dir})
-          -post-package
-          -post-build
-          -pre-clean
-  -->
-  <import file="custom_rules.xml" optional="true"/>
-
-  <!-- Import the actual build file.
-
-       To customize existing targets, there are two options:
-       - Customize only one target:
-           - copy/paste the target into this file, *before* the
-             <import> task.
-           - customize it to your needs.
-       - Customize the whole content of build.xml
-           - copy/paste the content of the rules files (minus the top node)
-             into this file, replacing the <import> task.
-           - customize to your needs.
-
-       ***********************
-       ****** IMPORTANT ******
-       ***********************
-       In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-       in order to avoid having your file be overridden by tools such as "android update project"
-  -->
-  <!-- version-tag: 1 -->
-  <import file="${sdk.dir}/tools/ant/build.xml"/>
-
-</project>
diff --git a/third_party/gif_decoder/custom_rules.xml b/third_party/gif_decoder/custom_rules.xml
deleted file mode 100644
index dd568923..00000000
--- a/third_party/gif_decoder/custom_rules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="glide-rules" default="help">
-    <xmlproperty file="AndroidManifest.xml" prefix="mymanifest" collapseAttributes="true"/>
-
-    <target name="jar" depends="-compile">
-        <jar destfile="bin/gifdecoder-${mymanifest.manifest.android:versionName}.jar"
-            basedir="bin/classes" >
-        </jar>
-    </target>
-</project>
diff --git a/third_party/gif_decoder/project.properties b/third_party/gif_decoder/project.properties
deleted file mode 100644
index d226f51c..00000000
--- a/third_party/gif_decoder/project.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-target=android-19
-
-# https://code.google.com/p/android/issues/detail?id=40487
-renderscript.opt.level=O0
-
-android.library=true
diff --git a/third_party/gif_decoder/src/main/AndroidManifest.xml b/third_party/gif_decoder/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..2f91b04e
--- /dev/null
+++ b/third_party/gif_decoder/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.bumptech.glide.gifdecoder">
+  <application />
+</manifest>