Fix build.gradle/Android.mk

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)

SafeParcel

@@ -1 +1 @@
-Subproject commit 462316b18e2620bd5c0cb843abd67671d941300d
+Subproject commit 0bb4f3d602d8565bbf500a880f563a2b1fa47d1d

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 {

settings.gradle

@@ -1 +1,3 @@
+rootProject.name = 'play-services-api'
+
 include ':SafeParcel'