Integrate Latest @ 197965599

jonsimantov · jonsimantov · commit 50cd19b4293b · 2018-05-25T16:14:19.000-07:00
Changes to all ...
- Update Firebase dependencies to latest versions.
- Rename library files to libfirebase_*.a.

CL: 197965599
diff --git a/admob/testapp/build.gradle b/admob/testapp/build.gradle
@@ -91,8 +91,8 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:15.0.2'
-  compile 'com.google.firebase:firebase-ads:15.0.1'
+  compile 'com.google.firebase:firebase-core:16.0.0'
+  compile 'com.google.firebase:firebase-ads:16.0.0'
   compile 'com.google.android.gms:play-services-base:15.0.1'
 }
 
diff --git a/admob/testapp/jni/Android.mk b/admob/testapp/jni/Android.mk
@@ -25,13 +25,13 @@ $(FIREBASE_CPP_SDK_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_app
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libapp.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_app.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_admob
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libadmob.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_admob.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
diff --git a/analytics/testapp/build.gradle b/analytics/testapp/build.gradle
@@ -91,8 +91,8 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:15.0.2'
-  compile 'com.google.firebase:firebase-analytics:15.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.0'
+  compile 'com.google.firebase:firebase-analytics:16.0.0'
   compile 'com.google.android.gms:play-services-base:15.0.1'
 }
 
diff --git a/analytics/testapp/jni/Android.mk b/analytics/testapp/jni/Android.mk
@@ -25,13 +25,13 @@ $(FIREBASE_CPP_SDK_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_app
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libapp.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_app.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_analytics
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libanalytics.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_analytics.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
diff --git a/auth/testapp/build.gradle b/auth/testapp/build.gradle
@@ -91,8 +91,8 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:15.0.2'
-  compile 'com.google.firebase:firebase-auth:15.1.0'
+  compile 'com.google.firebase:firebase-core:16.0.0'
+  compile 'com.google.firebase:firebase-auth:16.0.1'
   compile 'com.google.android.gms:play-services-base:15.0.1'
 }
 
diff --git a/auth/testapp/jni/Android.mk b/auth/testapp/jni/Android.mk
@@ -25,13 +25,13 @@ $(FIREBASE_CPP_SDK_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_app
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libapp.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_app.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_auth
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libauth.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_auth.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
diff --git a/database/testapp/build.gradle b/database/testapp/build.gradle
@@ -92,9 +92,9 @@ android {
 }
 
 dependencies {
-    compile 'com.google.firebase:firebase-core:15.0.2'
-    compile 'com.google.firebase:firebase-auth:15.1.0'
-    compile 'com.google.firebase:firebase-database:15.0.1'
+    compile 'com.google.firebase:firebase-core:16.0.0'
+    compile 'com.google.firebase:firebase-auth:16.0.1'
+    compile 'com.google.firebase:firebase-database:16.0.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/database/testapp/jni/Android.mk b/database/testapp/jni/Android.mk
@@ -25,19 +25,19 @@ $(FIREBASE_CPP_SDK_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_app
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libapp.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_app.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_auth
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libauth.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_auth.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_database
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libdatabase.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_database.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
diff --git a/dynamic_links/testapp/build.gradle b/dynamic_links/testapp/build.gradle
@@ -91,8 +91,8 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:15.0.2'
-  compile 'com.google.firebase:firebase-invites:15.0.1'
+  compile 'com.google.firebase:firebase-core:16.0.0'
+  compile 'com.google.firebase:firebase-invites:16.0.0'
   compile 'com.google.android.gms:play-services-base:15.0.1'
 }
 
diff --git a/dynamic_links/testapp/jni/Android.mk b/dynamic_links/testapp/jni/Android.mk
@@ -25,13 +25,13 @@ $(FIREBASE_CPP_SDK_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_app
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libapp.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_app.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_dynamic_links
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libdynamic_links.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_dynamic_links.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
diff --git a/invites/testapp/build.gradle b/invites/testapp/build.gradle
@@ -91,8 +91,8 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:15.0.2'
-  compile 'com.google.firebase:firebase-invites:15.0.1'
+  compile 'com.google.firebase:firebase-core:16.0.0'
+  compile 'com.google.firebase:firebase-invites:16.0.0'
   compile 'com.google.android.gms:play-services-base:15.0.1'
 }
 
diff --git a/invites/testapp/jni/Android.mk b/invites/testapp/jni/Android.mk
@@ -25,13 +25,13 @@ $(FIREBASE_CPP_SDK_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_app
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libapp.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_app.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_invites
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libinvites.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_invites.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
diff --git a/messaging/testapp/build.gradle b/messaging/testapp/build.gradle
@@ -98,8 +98,8 @@ repositories {
 
 dependencies {
   compile 'com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar'
-  compile 'com.google.firebase:firebase-core:15.0.2'
-  compile 'com.google.firebase:firebase-messaging:15.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.0'
+  compile 'com.google.firebase:firebase-messaging:17.0.0'
   compile 'com.google.android.gms:play-services-base:15.0.1'
 }
 
diff --git a/messaging/testapp/jni/Android.mk b/messaging/testapp/jni/Android.mk
@@ -25,13 +25,13 @@ $(FIREBASE_CPP_SDK_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_app
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libapp.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_app.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_messaging
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libmessaging.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_messaging.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
diff --git a/remote_config/testapp/build.gradle b/remote_config/testapp/build.gradle
@@ -91,8 +91,8 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:15.0.2'
-  compile 'com.google.firebase:firebase-config:15.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.0'
+  compile 'com.google.firebase:firebase-config:16.0.0'
   compile 'com.google.android.gms:play-services-base:15.0.1'
 }
 
diff --git a/remote_config/testapp/jni/Android.mk b/remote_config/testapp/jni/Android.mk
@@ -25,13 +25,13 @@ $(FIREBASE_CPP_SDK_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_app
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libapp.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_app.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_remote_config
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libremote_config.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_remote_config.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
diff --git a/storage/testapp/build.gradle b/storage/testapp/build.gradle
@@ -92,9 +92,9 @@ android {
 }
 
 dependencies {
-    compile 'com.google.firebase:firebase-core:15.0.2'
-    compile 'com.google.firebase:firebase-auth:15.1.0'
-    compile 'com.google.firebase:firebase-storage:15.0.2'
+    compile 'com.google.firebase:firebase-core:16.0.0'
+    compile 'com.google.firebase:firebase-auth:16.0.1'
+    compile 'com.google.firebase:firebase-storage:16.0.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/storage/testapp/jni/Android.mk b/storage/testapp/jni/Android.mk
@@ -25,19 +25,19 @@ $(FIREBASE_CPP_SDK_DIR)/libs/android/$(TARGET_ARCH_ABI)/$(STL)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_app
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libapp.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_app.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_auth
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libauth.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_auth.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=firebase_storage
-LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libstorage.a
+LOCAL_SRC_FILES:=$(FIREBASE_LIBRARY_PATH)/libfirebase_storage.a
 LOCAL_EXPORT_C_INCLUDES:=$(FIREBASE_CPP_SDK_DIR)/include
 include $(PREBUILT_STATIC_LIBRARY)
 

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ android {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`dependencies {`
`94`		`- compile 'com.google.firebase:firebase-core:15.0.2'`
`95`		`- compile 'com.google.firebase:firebase-ads:15.0.1'`
	`94`	`+ compile 'com.google.firebase:firebase-core:16.0.0'`
	`95`	`+ compile 'com.google.firebase:firebase-ads:16.0.0'`
`96`	`96`	`compile 'com.google.android.gms:play-services-base:15.0.1'`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ android {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`dependencies {`
`95`		`- compile 'com.google.firebase:firebase-core:15.0.2'`
`96`		`- compile 'com.google.firebase:firebase-auth:15.1.0'`
`97`		`- compile 'com.google.firebase:firebase-database:15.0.1'`
	`95`	`+ compile 'com.google.firebase:firebase-core:16.0.0'`
	`96`	`+ compile 'com.google.firebase:firebase-auth:16.0.1'`
	`97`	`+ compile 'com.google.firebase:firebase-database:16.0.1'`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`apply plugin: 'com.google.gms.google-services'`