From 546b19363f7e8bcfe2edd8c458be563d76ef0571 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Mon, 7 Aug 2017 13:23:35 +0200 Subject: [PATCH 1/2] Backed out changeset 514cf1f55c6f (bug 1380639) --- build/autoconf/android.m4 | 61 +++++++++------------ mobile/android/app/build.gradle | 1 - mobile/android/base/Makefile.in | 5 -- mobile/android/base/moz.build | 6 -- python/mozboot/mozboot/android-packages.txt | 1 - 5 files changed, 27 insertions(+), 47 deletions(-) diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4 index 13868f20453d..29f9c9a2ad3a 100644 --- a/build/autoconf/android.m4 +++ b/build/autoconf/android.m4 @@ -169,14 +169,14 @@ dnl Find an AAR and expose variables representing its exploded components. dnl AC_SUBSTs ANDROID_NAME_{AAR,AAR_RES,AAR_LIB,AAR_INTERNAL_LIB}. dnl Arg 1: name, like play-services-base dnl Arg 2: version, like 7.8.0 -dnl Arg 3: extras subdirectory, like extras, extras/android, or extras/google. +dnl Arg 3: extras subdirectory, either android or google dnl Arg 4: package subdirectory, like com/google/android/gms dnl Arg 5: if non-empty, expect and require internal_impl JAR. dnl Arg 6: if non-empty, expect and require assets/ directory. AC_DEFUN([MOZ_ANDROID_AAR],[ define([local_aar_var_base], translit($1, [-a-z], [_A-Z])) define([local_aar_var], concat(ANDROID_, local_aar_var_base, _AAR)) - local_aar_var="$ANDROID_SDK_ROOT/$3/m2repository/$4/$1/$2/$1-$2.aar" + local_aar_var="$ANDROID_SDK_ROOT/extras/$3/m2repository/$4/$1/$2/$1-$2.aar" AC_MSG_CHECKING([for $1 AAR]) if ! test -e "$local_aar_var" ; then AC_MSG_ERROR([You must download the $1 AAR. Run the Android SDK tool and install the Android and Google Support Repositories under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (Looked for $local_aar_var)]) @@ -199,10 +199,10 @@ AC_DEFUN([MOZ_ANDROID_GOOGLE_PLAY_SERVICES], [ if test -n "$MOZ_NATIVE_DEVICES" ; then - MOZ_ANDROID_AAR(play-services-base, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, extras/google, com/google/android/gms) - MOZ_ANDROID_AAR(play-services-basement, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, extras/google, com/google/android/gms) - MOZ_ANDROID_AAR(play-services-cast, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, extras/google, com/google/android/gms) - MOZ_ANDROID_AAR(mediarouter-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support, REQUIRED_INTERNAL_IMPL) + 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-cast, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, google, com/google/android/gms) + MOZ_ANDROID_AAR(mediarouter-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support, REQUIRED_INTERNAL_IMPL) fi ]) @@ -211,10 +211,10 @@ AC_DEFUN([MOZ_ANDROID_GOOGLE_CLOUD_MESSAGING], [ if test -n "$MOZ_ANDROID_GCM" ; then - MOZ_ANDROID_AAR(play-services-base, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, extras/google, com/google/android/gms) - MOZ_ANDROID_AAR(play-services-basement, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, extras/google, com/google/android/gms) - MOZ_ANDROID_AAR(play-services-gcm, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, extras/google, com/google/android/gms) - MOZ_ANDROID_AAR(play-services-measurement, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, extras/google, com/google/android/gms) + 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 ]) @@ -223,8 +223,8 @@ AC_DEFUN([MOZ_ANDROID_INSTALL_TRACKING], [ if test -n "$MOZ_INSTALL_TRACKING"; then - MOZ_ANDROID_AAR(play-services-ads, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, extras/google, com/google/android/gms) - MOZ_ANDROID_AAR(play-services-basement, $ANDROID_GOOGLE_PLAY_SERVICES_VERSION, extras/google, com/google/android/gms) + MOZ_ANDROID_AAR(play-services-ads, $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) fi ]) @@ -340,32 +340,25 @@ case "$target" in AC_SUBST(ANDROID_TOOLS) AC_SUBST(ANDROID_BUILD_TOOLS_VERSION) - MOZ_ANDROID_AAR(customtabs, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support) - MOZ_ANDROID_AAR(appcompat-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support) - MOZ_ANDROID_AAR(support-vector-drawable, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support) - MOZ_ANDROID_AAR(animated-vector-drawable, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support) - MOZ_ANDROID_AAR(cardview-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support) - MOZ_ANDROID_AAR(design, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support) - MOZ_ANDROID_AAR(recyclerview-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support) - MOZ_ANDROID_AAR(support-v4, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support, REQUIRED_INTERNAL_IMPL) - MOZ_ANDROID_AAR(palette-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, extras/android, com/android/support) - MOZ_ANDROID_AAR(constraint-layout, 1.0.2, extras, com/android/support/constraint) + 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(support-vector-drawable, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) + MOZ_ANDROID_AAR(animated-vector-drawable, $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) + MOZ_ANDROID_AAR(recyclerview-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) + MOZ_ANDROID_AAR(support-v4, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support, REQUIRED_INTERNAL_IMPL) + MOZ_ANDROID_AAR(palette-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) - ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB="$ANDROID_SDK_ROOT/extras/android/m2repository/com/android/support/support-annotations/$ANDROID_SUPPORT_LIBRARY_VERSION/support-annotations-$ANDROID_SUPPORT_LIBRARY_VERSION.jar" + ANDROID_SUPPORT_ANNOTATIONS_JAR="$ANDROID_SDK_ROOT/extras/android/m2repository/com/android/support/support-annotations/$ANDROID_SUPPORT_LIBRARY_VERSION/support-annotations-$ANDROID_SUPPORT_LIBRARY_VERSION.jar" AC_MSG_CHECKING([for support-annotations JAR]) - if ! test -e $ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB ; then - AC_MSG_ERROR([You must download the support-annotations lib. Run the Android SDK tool and install the Android Support Repository under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB)]) + if ! test -e $ANDROID_SUPPORT_ANNOTATIONS_JAR ; then + AC_MSG_ERROR([You must download the support-annotations lib. Run the Android SDK tool and install the Android Support Repository under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_SUPPORT_ANNOTATIONS_JAR)]) fi - AC_MSG_RESULT([$ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB]) + AC_MSG_RESULT([$ANDROID_SUPPORT_ANNOTATIONS_JAR]) + AC_SUBST(ANDROID_SUPPORT_ANNOTATIONS_JAR) + ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB=$ANDROID_SUPPORT_ANNOTATIONS_JAR AC_SUBST(ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB) - - ANDROID_CONSTRAINT_LAYOUT_SOLVER_JAR_LIB="$ANDROID_SDK_ROOT/extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2/constraint-layout-solver-1.0.2.jar" - AC_MSG_CHECKING([for constraint-layout-solver JAR]) - if ! test -e $ANDROID_CONSTRAINT_LAYOUT_SOLVER_JAR_LIB ; then - AC_MSG_ERROR([You must download the constraint-layout-solver lib. Run the Android SDK tool and install the Android Support Repository under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_CONSTRAINT_LAYOUT_SOLVER_JAR_LIB)]) - fi - AC_MSG_RESULT([$ANDROID_CONSTRAINT_LAYOUT_SOLVER_JAR_LIB]) - AC_SUBST(ANDROID_CONSTRAINT_LAYOUT_SOLVER_JAR_LIB) ;; esac diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index a5ace6e9f763..ad4303b5dc40 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -234,7 +234,6 @@ dependencies { compile "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" compile "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" compile "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" - compile 'com.android.support.constraint:constraint-layout:1.0.2' 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 5f56be96546b..8244caa9bb3c 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -48,8 +48,6 @@ JAVA_CLASSPATH += \ $(ANDROID_RECYCLERVIEW_V7_AAR_LIB) \ $(ANDROID_CUSTOMTABS_AAR_LIB) \ $(ANDROID_PALETTE_V7_AAR_LIB) \ - $(ANDROID_CONSTRAINT_LAYOUT_AAR_LIB) \ - $(ANDROID_CONSTRAINT_LAYOUT_SOLVER_JAR_LIB) \ $(NULL) # If native devices are enabled, add Google Play Services and some of the v7 @@ -105,8 +103,6 @@ java_bundled_libs := \ $(ANDROID_RECYCLERVIEW_V7_AAR_LIB) \ $(ANDROID_CUSTOMTABS_AAR_LIB) \ $(ANDROID_PALETTE_V7_AAR_LIB) \ - $(ANDROID_CONSTRAINT_LAYOUT_AAR_LIB) \ - $(ANDROID_CONSTRAINT_LAYOUT_SOLVER_JAR_LIB) \ $(NULL) ifdef MOZ_NATIVE_DEVICES @@ -413,7 +409,6 @@ 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/constraint/R.java: .aapt.deps ; # (no resources) generated/android/support/customtabs/R.java: .aapt.deps ; # (no resources) generated/android/support/v7/palette/R.java: .aapt.deps ; generated/com/google/android/gms/R.java: .aapt.deps ; diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index 36323353f9bb..5e267d4e2f59 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -239,10 +239,6 @@ if CONFIG['ANDROID_PALETTE_V7_AAR']: ANDROID_EXTRA_PACKAGES += ['android.support.v7.palette'] ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_PALETTE_V7_AAR_RES']] # (no resources) resjar.generated_sources += ['generated/android/support/v7/palette/R.java'] -if CONFIG['ANDROID_CONSTRAINT_LAYOUT_AAR']: - ANDROID_EXTRA_PACKAGES += ['android.support.constraint'] - ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_CONSTRAINT_LAYOUT_AAR_RES']] - resjar.generated_sources += ['generated/android/support/constraint/R.java'] resjar.javac_flags += ['-Xlint:all'] @@ -1180,8 +1176,6 @@ 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.extra_jars += [CONFIG['ANDROID_PALETTE_V7_AAR_LIB']] -gbjar.extra_jars += [CONFIG['ANDROID_CONSTRAINT_LAYOUT_AAR_LIB']] -gbjar.extra_jars += [CONFIG['ANDROID_CONSTRAINT_LAYOUT_SOLVER_JAR_LIB']] gbjar.javac_flags += ['-Xlint:all,-deprecation,-fallthrough', '-J-Xmx512m', '-J-Xms128m'] diff --git a/python/mozboot/mozboot/android-packages.txt b/python/mozboot/mozboot/android-packages.txt index 79b1c183e828..cf034072a5ca 100644 --- a/python/mozboot/mozboot/android-packages.txt +++ b/python/mozboot/mozboot/android-packages.txt @@ -3,4 +3,3 @@ build-tools;23.0.3 platforms;android-23 extras;android;m2repository extras;google;m2repository -extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 From bd39b6170f04afeefc751a23bb04e18bbd10352b Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Mon, 7 Aug 2017 13:23:57 +0200 Subject: [PATCH 2/2] Backed out changeset ebb30b6d6184 (bug 1380639) on request from sebastian --- .../tooltool-manifests/android-frontend/releng.manifest | 4 ++-- .../config/tooltool-manifests/android-x86/releng.manifest | 4 ++-- .../android/config/tooltool-manifests/android/releng.manifest | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest index 1e29b76e6c59..4fbc3a7ce0e0 100644 --- a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest @@ -1,8 +1,8 @@ [ { - "size": 735225120, + "size": 735632692, "visibility": "internal", - "digest": "ec936b87d151fcf0a5920e0954fbfff18fc04595d753f6b11a0582faee3ce60e3429c828a94c1533ae31ff27272a6d0c637d901153b946e51241ea89ce8179b3", + "digest": "dc4329803b4f941d52d61a32c054e209890c2dd793ac2cbbeadb15e4bd23104f7ba99c113472326c7751dbe99e00238208432a05183d9a01bed13f38297b3b3c", "algorithm": "sha512", "filename": "android-sdk-linux.tar.xz", "unpack": true diff --git a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest index e4f6e891f816..d6bbf6125afb 100644 --- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest @@ -9,9 +9,9 @@ "unpack": true }, { - "size": 735225120, + "size": 735632692, "visibility": "internal", - "digest": "ec936b87d151fcf0a5920e0954fbfff18fc04595d753f6b11a0582faee3ce60e3429c828a94c1533ae31ff27272a6d0c637d901153b946e51241ea89ce8179b3", + "digest": "dc4329803b4f941d52d61a32c054e209890c2dd793ac2cbbeadb15e4bd23104f7ba99c113472326c7751dbe99e00238208432a05183d9a01bed13f38297b3b3c", "algorithm": "sha512", "filename": "android-sdk-linux.tar.xz", "unpack": true diff --git a/mobile/android/config/tooltool-manifests/android/releng.manifest b/mobile/android/config/tooltool-manifests/android/releng.manifest index 46aaea01be1d..0c333f5cfb30 100644 --- a/mobile/android/config/tooltool-manifests/android/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android/releng.manifest @@ -9,9 +9,9 @@ "unpack": true }, { - "size": 735225120, + "size": 735632692, "visibility": "internal", - "digest": "ec936b87d151fcf0a5920e0954fbfff18fc04595d753f6b11a0582faee3ce60e3429c828a94c1533ae31ff27272a6d0c637d901153b946e51241ea89ce8179b3", + "digest": "dc4329803b4f941d52d61a32c054e209890c2dd793ac2cbbeadb15e4bd23104f7ba99c113472326c7751dbe99e00238208432a05183d9a01bed13f38297b3b3c", "algorithm": "sha512", "filename": "android-sdk-linux.tar.xz", "unpack": true