Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0

Android 4.4 Release 1.0

2 files changed, 13 insertions, 3 deletions

diff --git a/Android.mk b/Android.mk
index 95ac73e..2e03c2b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,9 +22,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := jsr305
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
-# Include this library in the build server's output directory
-$(call dist-for-goals, dist_files, $(LOCAL_BUILT_MODULE):guava.jar)
-
 # Also build a host-side library
 include $(CLEAR_VARS)
 
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..25c1608
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'java'
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['guava/src']
+        }
+    }
+}
+
+dependencies {
+    compile project(':external:jsr305')
+}