Update to gradle style project

.gitmodules

@@ -1,12 +1,6 @@
-[submodule "UnifiedNlpApi"]
-	path = UnifiedNlpApi
-	url = https://github.com/microg/android_external_UnifiedNlpApi.git
 [submodule "UnifiedNlpLib"]
 	path = UnifiedNlpLib
 	url = https://github.com/microg/android_packages_apps_UnifiedNlp.git
-[submodule "GmsApi"]
+[submodule "play-services-api"]
-	path = GmsApi
+	path = play-services-api
 	url = https://github.com/microg/android_external_GmsApi.git
-[submodule "SafeParcel"]
-	path = SafeParcel
-	url = https://github.com/microg/android_external_SafeParcel.git

Android.mk

@@ -20,8 +20,8 @@ unified_dir := ../UnifiedNlp
 appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat
 res_dir := res $(unified_dir)/res $(appcompat_dir)/res
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+LOCAL_SRC_FILES := $(call all-java-files-under, play-services-core/src/main/java) \
-                   $(call all-Iaidl-files-under, src) \
+                   $(call all-java-files-under, play-services-core/src/main/protos-java) \
                    $(call all-java-files-under, $(unified_dir)/src) \
 
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))

GmsApi

@@ -1 +0,0 @@
-Subproject commit 1510aa1b0adeeed9dbe591b25ad75b015f968d82

SafeParcel

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

SafeParcel

@@ -0,0 +1 @@
+play-services-api/SafeParcel/

UnifiedNlpApi

@@ -1 +0,0 @@
-Subproject commit 06d1132344b4600ae00bda63d4da0acff7de42f0

UnifiedNlpApi

@@ -0,0 +1 @@
+UnifiedNlpLib/UnifiedNlpApi

play-services-api

@@ -0,0 +1 @@
+Subproject commit dbae4add94505fb0765ca9a18896848df6ae6ae4

play-services-core/build.gradle

@@ -28,7 +28,7 @@ apply plugin: 'com.android.application'
 repositories {
     mavenCentral()
     flatDir {
-        dirs 'libs'
+        dirs '../libs'
     }
 }
 
@@ -39,7 +39,7 @@ dependencies {
     compile 'de.hdodenhof:circleimageview:1.2.1'
     compile 'com.squareup.wire:wire-runtime:1.6.1'
 
-    compile project(':GmsApi')
+    compile project(':play-services-api')
     compile project(':UnifiedNlpLib')
 
     // vtm from ./libs
@@ -59,15 +59,10 @@ dependencies {
 android {
     compileSdkVersion 21
     buildToolsVersion "21.1.2"
-    lintOptions.abortOnError false
 
     sourceSets {
         main {
-            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs += 'src/main/protos-java'
-            java.srcDirs = ['src', 'protos-src']
-            aidl.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
         }
     }
 }