diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4 index d0b3c36ea93f..7139f2b9594d 100644 --- a/build/autoconf/android.m4 +++ b/build/autoconf/android.m4 @@ -234,6 +234,7 @@ if test -n "$MOZ_ANDROID_GCM" ; then MOZ_ANDROID_AAR(play-services-base, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, google, com/google/android/gms) MOZ_ANDROID_AAR(play-services-basement, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, google, com/google/android/gms) MOZ_ANDROID_AAR(play-services-gcm, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, google, com/google/android/gms) + MOZ_ANDROID_AAR(play-services-measurement, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, google, com/google/android/gms) fi ]) diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index 9ce4620ded87..d10db1adf3a6 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -195,6 +195,7 @@ dependencies { compile "com.google.android.gms:play-services-basement:${mozconfig.substs.ANDROID_GOOGLE_PLAY_SERVICES_VERSION}" compile "com.google.android.gms:play-services-base:${mozconfig.substs.ANDROID_GOOGLE_PLAY_SERVICES_VERSION}" compile "com.google.android.gms:play-services-gcm:${mozconfig.substs.ANDROID_GOOGLE_PLAY_SERVICES_VERSION}" + compile "com.google.android.gms:play-services-measurement:${mozconfig.substs.ANDROID_GOOGLE_PLAY_SERVICES_VERSION}" } // Gradle based builds include LeakCanary. Gradle based tests include the no-op version. Mach diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 1631862578c9..23259c799cbc 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -84,6 +84,7 @@ ifdef MOZ_ANDROID_GCM $(ANDROID_PLAY_SERVICES_BASE_AAR_LIB) \ $(ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB) \ $(ANDROID_PLAY_SERVICES_GCM_AAR_LIB) \ + $(ANDROID_PLAY_SERVICES_MEASUREMENT_AAR_LIB) \ $(NULL) endif @@ -124,6 +125,7 @@ ifdef MOZ_ANDROID_GCM $(ANDROID_PLAY_SERVICES_BASE_AAR_LIB) \ $(ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB) \ $(ANDROID_PLAY_SERVICES_GCM_AAR_LIB) \ + $(ANDROID_PLAY_SERVICES_MEASUREMENT_AAR_LIB) \ $(NULL) endif @@ -431,6 +433,7 @@ generated/com/google/android/gms/appindexing/R.java: .aapt.deps ; generated/com/google/android/gms/base/R.java: .aapt.deps ; generated/com/google/android/gms/cast/R.java: .aapt.deps ; generated/com/google/android/gms/gcm/R.java: .aapt.deps ; +generated/com/google/android/gms/measurement/R.java: .aapt.deps ; gecko.ap_: .aapt.deps ; R.txt: .aapt.deps ; diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index fe0f744e8da7..97a3f756e920 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -775,6 +775,7 @@ if CONFIG['MOZ_ANDROID_GCM']: CONFIG['ANDROID_PLAY_SERVICES_BASE_AAR_LIB'], CONFIG['ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB'], CONFIG['ANDROID_PLAY_SERVICES_GCM_AAR_LIB'], + CONFIG['ANDROID_PLAY_SERVICES_MEASUREMENT_AAR_LIB'], ] if CONFIG['ANDROID_PLAY_SERVICES_BASE_AAR']: @@ -792,6 +793,11 @@ if CONFIG['MOZ_ANDROID_GCM']: ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_PLAY_SERVICES_GCM_AAR_RES']] resjar.generated_sources += ['com/google/android/gms/gcm/R.java'] + if CONFIG['ANDROID_PLAY_SERVICES_MEASUREMENT_AAR']: + ANDROID_EXTRA_PACKAGES += ['com.google.android.gms.measurement'] + ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_PLAY_SERVICES_MEASUREMENT_AAR_RES']] + resjar.generated_sources += ['com/google/android/gms/measurement/R.java'] + if CONFIG['MOZ_INSTALL_TRACKING']: gbjar.extra_jars += [ CONFIG['ANDROID_PLAY_SERVICES_ADS_AAR_LIB'],