From 38f5ea7b19dbfea4ee505b0e4486c2759db3ae4a Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Fri, 10 Jun 2016 11:01:11 +0200 Subject: [PATCH] Bug 1276696 - Add custom tabs support library. r=mcomella MozReview-Commit-ID: LXie1GiV4gV --HG-- extra : rebase_source : 7316ebbe6512db64364c0a4f450e0758f79fcc5c --- CLOBBER | 2 +- build/autoconf/android.m4 | 1 + mobile/android/app/build.gradle | 1 + mobile/android/base/Makefile.in | 3 +++ mobile/android/base/moz.build | 5 +++++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CLOBBER b/CLOBBER index d4cdfaff33de..4578d97af4a7 100644 --- a/CLOBBER +++ b/CLOBBER @@ -22,4 +22,4 @@ # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more. -Merge day clobber \ No newline at end of file +Bug 1276696 - New Android dependencies diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4 index 899dcb4d5be9..9c2b17b5e535 100644 --- a/build/autoconf/android.m4 +++ b/build/autoconf/android.m4 @@ -341,6 +341,7 @@ case "$target" in AC_SUBST(ANDROID_TOOLS) AC_SUBST(ANDROID_BUILD_TOOLS_VERSION) + MOZ_ANDROID_AAR(customtabs, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) MOZ_ANDROID_AAR(appcompat-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) MOZ_ANDROID_AAR(cardview-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) MOZ_ANDROID_AAR(design, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index b1216e63fbfa..ac5335212ec6 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -176,6 +176,7 @@ dependencies { compile "com.android.support:cardview-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" compile "com.android.support:recyclerview-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" compile "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" + compile "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" if (mozconfig.substs.MOZ_NATIVE_DEVICES) { compile "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 5b21bbd12f45..6f5eb2fb0ce5 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -65,6 +65,7 @@ JAVA_CLASSPATH += \ $(ANDROID_CARDVIEW_V7_AAR_LIB) \ $(ANDROID_DESIGN_AAR_LIB) \ $(ANDROID_RECYCLERVIEW_V7_AAR_LIB) \ + $(ANDROID_CUSTOMTABS_AAR_LIB) \ $(NULL) # If native devices are enabled, add Google Play Services and some of the v7 @@ -106,6 +107,7 @@ java_bundled_libs := \ $(ANDROID_CARDVIEW_V7_AAR_LIB) \ $(ANDROID_DESIGN_AAR_LIB) \ $(ANDROID_RECYCLERVIEW_V7_AAR_LIB) \ + $(ANDROID_CUSTOMTABS_AAR_LIB) \ $(NULL) ifdef MOZ_NATIVE_DEVICES @@ -432,6 +434,7 @@ generated/android/support/v7/cardview/R.java: .aapt.deps ; generated/android/support/design/R.java: .aapt.deps ; generated/android/support/v7/mediarouter/R.java: .aapt.deps ; generated/android/support/v7/recyclerview/R.java: .aapt.deps ; +generated/android/support/customtabs/R.java: .aapt.deps ; generated/com/google/android/gms/R.java: .aapt.deps ; generated/com/google/android/gms/ads/R.java: .aapt.deps ; generated/com/google/android/gms/base/R.java: .aapt.deps ; diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index cc6d4fbf9cb5..2c0d8c14fb0b 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -74,6 +74,10 @@ if CONFIG['ANDROID_RECYCLERVIEW_V7_AAR']: ANDROID_EXTRA_PACKAGES += ['android.support.v7.recyclerview'] ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_RECYCLERVIEW_V7_AAR_RES']] resjar.generated_sources += ['android/support/v7/recyclerview/R.java'] +if CONFIG['ANDROID_CUSTOMTABS_AAR']: + ANDROID_EXTRA_PACKAGES += ['android.support.customtabs'] + ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_CUSTOMTABS_AAR_RES']] + resjar.generated_sources += ['android/support/customtabs/R.java'] resjar.javac_flags += ['-Xlint:all'] @@ -822,6 +826,7 @@ gbjar.extra_jars += [CONFIG['ANDROID_APPCOMPAT_V7_AAR_LIB']] gbjar.extra_jars += [CONFIG['ANDROID_CARDVIEW_V7_AAR_LIB']] gbjar.extra_jars += [CONFIG['ANDROID_DESIGN_AAR_LIB']] gbjar.extra_jars += [CONFIG['ANDROID_RECYCLERVIEW_V7_AAR_LIB']] +gbjar.extra_jars += [CONFIG['ANDROID_CUSTOMTABS_AAR_LIB']] gbjar.javac_flags += ['-Xlint:all,-deprecation,-fallthrough', '-J-Xmx512m', '-J-Xms128m']