From 011f53cdbe4e6385a152b491235c4ad24d1ed0b6 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Sun, 25 Aug 2013 16:54:07 -0500
Subject: [PATCH] Package libaac-encoder in android-aac-enc module

---
 android-aac-enc/build.gradle | 19 +++++++++++++++++++
 astrid/build.gradle          | 12 ------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/android-aac-enc/build.gradle b/android-aac-enc/build.gradle
index f9c213af4..37a5ef79b 100644
--- a/android-aac-enc/build.gradle
+++ b/android-aac-enc/build.gradle
@@ -21,8 +21,27 @@ android {
         minSdkVersion 7
         targetSdkVersion 17
     }
+
+    task jarNativeLib(type: Zip) {
+        destinationDir file("libs")
+        baseName 'libaac-encoder'
+        extension 'jar'
+        from fileTree(dir: 'libs/armeabi', include: 'libaac-encoder.so')
+        into 'lib/armeabi'
+    }
+
+    tasks.withType(Compile) {
+        compileTask -> compileTask.dependsOn(jarNativeLib)
+    }
+
+    task cleanNativeLib {
+        delete 'libs/libaac-encoder.jar'
+    }
+
+    clean.dependsOn 'cleanNativeLib'
 }
 
 dependencies {
     compile 'com.android.support:support-v4:18.0.0'
+    compile files('libs/libaac-encoder.jar')
 }
diff --git a/astrid/build.gradle b/astrid/build.gradle
index d5e49e628..b68067bff 100644
--- a/astrid/build.gradle
+++ b/astrid/build.gradle
@@ -29,18 +29,6 @@ android {
             proguardFile getDefaultProguardFile('proguard-android.txt')
         }
     }
-
-    task nativeLibsToJar(type: Zip) {
-        destinationDir file("libs")
-        baseName 'libaac-encoder'
-        extension 'jar'
-        from fileTree(dir: '../android-aac-enc/libs/armeabi', include: 'libaac-encoder.so')
-        into 'lib/armeabi'
-    }
-
-    tasks.withType(Compile) {
-        compileTask -> compileTask.dependsOn(nativeLibsToJar)
-    }
 }
 
 dependencies {