From de30e92599aaad45aaff9089e8f1b2c019182803 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Fri, 13 Mar 2015 16:32:23 +0100
Subject: [PATCH] Update unified nlp

---
 .gitmodules                     | 6 +++---
 UnifiedNlpApi                   | 1 -
 UnifiedNlpLib                   | 1 -
 extern/UnifiedNlp               | 1 +
 play-services-core/build.gradle | 2 +-
 settings.gradle                 | 6 +++---
 unifiednlp-api                  | 1 +
 unifiednlp-base                 | 1 +
 unifiednlp-compat               | 1 +
 9 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 120000 UnifiedNlpApi
 delete mode 160000 UnifiedNlpLib
 create mode 160000 extern/UnifiedNlp
 create mode 120000 unifiednlp-api
 create mode 120000 unifiednlp-base
 create mode 120000 unifiednlp-compat

diff --git a/.gitmodules b/.gitmodules
index 99cf84da..692e8a81 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "UnifiedNlpLib"]
-	path = UnifiedNlpLib
-	url = https://github.com/microg/android_packages_apps_UnifiedNlp.git
 [submodule "play-services-api"]
 	path = play-services-api
 	url = https://github.com/microg/android_external_GmsApi.git
+[submodule "extern/UnifiedNlp"]
+	path = extern/UnifiedNlp
+	url = https://github.com/microg/android_packages_apps_UnifiedNlp.git
diff --git a/UnifiedNlpApi b/UnifiedNlpApi
deleted file mode 120000
index bf1c06f8..00000000
--- a/UnifiedNlpApi
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedNlpLib/UnifiedNlpApi
\ No newline at end of file
diff --git a/UnifiedNlpLib b/UnifiedNlpLib
deleted file mode 160000
index 4ee1acc7..00000000
--- a/UnifiedNlpLib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4ee1acc7385bc592506ac632d7a87c08372e345e
diff --git a/extern/UnifiedNlp b/extern/UnifiedNlp
new file mode 160000
index 00000000..b2e10a10
--- /dev/null
+++ b/extern/UnifiedNlp
@@ -0,0 +1 @@
+Subproject commit b2e10a10e47f4540fad1e609469dd5fff87002c5
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index df1bcc1d..6caea4f3 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     compile 'com.squareup.wire:wire-runtime:1.6.1'
 
     compile project(':play-services-api')
-    compile project(':UnifiedNlpLib')
+    compile project(':unifiednlp-base')
 
     // vtm from ./libs
     compile group: 'org.oscim', name: 'vtm-android', version: '0.6.0-SNAPSHOT', ext: 'aar'
diff --git a/settings.gradle b/settings.gradle
index fd73113a..76a74743 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
-include ':UnifiedNlpApi'
-include ':UnifiedNlpLib'
-include ':UnifiedNlpLib:compat'
+include ':unifiednlp-api'
+include ':unifiednlp-base'
+include ':unifiednlp-compat'
 
 include ':SafeParcel'
 include ':play-services-api'
diff --git a/unifiednlp-api b/unifiednlp-api
new file mode 120000
index 00000000..3f20712c
--- /dev/null
+++ b/unifiednlp-api
@@ -0,0 +1 @@
+extern/UnifiedNlp/unifiednlp-api
\ No newline at end of file
diff --git a/unifiednlp-base b/unifiednlp-base
new file mode 120000
index 00000000..8aaf2574
--- /dev/null
+++ b/unifiednlp-base
@@ -0,0 +1 @@
+extern/UnifiedNlp/unifiednlp-base
\ No newline at end of file
diff --git a/unifiednlp-compat b/unifiednlp-compat
new file mode 120000
index 00000000..c9950ae0
--- /dev/null
+++ b/unifiednlp-compat
@@ -0,0 +1 @@
+extern/UnifiedNlp/unifiednlp-compat
\ No newline at end of file