Update unified nlp

2015-03-13 16:32:23 +01:00 · 2015-03-13 16:32:23 +01:00 · de30e92599
parent dd443b262b
commit de30e92599
9 changed files with 11 additions and 9 deletions
--- 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
--- a/1
+++ b/1
@ -1 +0,0 @@
-UnifiedNlpLib/UnifiedNlpApi
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 4ee1acc7385bc592506ac632d7a87c08372e345e
--- a/extern/UnifiedNlp
+++ b/extern/UnifiedNlp
@ -0,0 +1 @@
+Subproject commit b2e10a10e47f4540fad1e609469dd5fff87002c5
--- 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'
--- 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'
--- a/1
+++ b/1
@ -0,0 +1 @@
+extern/UnifiedNlp/unifiednlp-api
--- a/1
+++ b/1
@ -0,0 +1 @@
+extern/UnifiedNlp/unifiednlp-base
--- a/1
+++ b/1
@ -0,0 +1 @@
+extern/UnifiedNlp/unifiednlp-compat
				`@ -1 +0,0 @@`
				`Subproject commit 4ee1acc7385bc592506ac632d7a87c08372e345e`
				`@ -0,0 +1 @@`
				`Subproject commit b2e10a10e47f4540fad1e609469dd5fff87002c5`