From d2ec5f52fa6c1aed0640e65130b20e3ffce5f8b0 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Fri, 13 Mar 2015 00:22:54 +0100
Subject: [PATCH] Fix build.gradle/Android.mk

---
 Android.mk      | 5 +++--
 SafeParcel      | 2 +-
 build.gradle    | 7 ++++++-
 settings.gradle | 2 ++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4b9abaa..8884543 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := GmsApi
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES := $(call all-Iaidl-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
+LOCAL_SRC_FILES := $(call all-Iaidl-files-under, src/main/aidl)
+LOCAL_STATIC_JAVA_LIBRARIES := SafeParcel
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/SafeParcel b/SafeParcel
index 462316b..0bb4f3d 160000
--- a/SafeParcel
+++ b/SafeParcel
@@ -1 +1 @@
-Subproject commit 462316b18e2620bd5c0cb843abd67671d941300d
+Subproject commit 0bb4f3d602d8565bbf500a880f563a2b1fa47d1d
diff --git a/build.gradle b/build.gradle
index 4849160..cd54816 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,13 +4,18 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.0.1'
+        classpath 'com.github.dcendents:android-maven-plugin:1.2'
     }
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group = 'org.microg.gms'
+version = '1.0-SNAPSHOT'
 
 dependencies {
-    compile project('SafeParcel')
+    compile project(':SafeParcel')
 }
 
 android {
diff --git a/settings.gradle b/settings.gradle
index 0151283..930a2c1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,3 @@
+rootProject.name = 'play-services-api'
+
 include ':SafeParcel'