commit b9a54ef4b0d356b99370eb5fae23d7502924de30 parent 59037546fdba6d613a57a43a091f022f3069da1d Author: Ruben Rodriguez <ruben@gnu.org> Date: Tue, 22 Dec 2015 18:08:23 -0600 Fix android packaging issues Diffstat:
| M | makeicecat | | | 9 | +++++++-- |
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/makeicecat b/makeicecat @@ -505,7 +505,11 @@ cp $ff32 image/test/unit/image2jpg32x32-win.png # Mobile ############################################################################### -sed '/MOZ_SERVICES_HEALTHREPORT/d; /MOZ_DEVICES/d; /MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' -i mobile/android/confvars.sh +echo "-dontwarn android.support.**" >> mobile/android/config/proguard/proguard.cfg +echo "-dontwarn android.support.**" >> mobile/android/config/proguard/strip-libs.cfg + +sed '/MOZ_ANDROID_SEARCH_ACTIVITY/d; /MOZ_SERVICES_HEALTHREPORT/d; /MOZ_DEVICES/d; /MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' -i mobile/android/confvars.sh +sed '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' -i configure.in cat << EOF >> mobile/android/confvars.sh # IceCat settings @@ -588,7 +592,8 @@ EOF # Add extensions to manifest for EXTENSION in $(ls $DATA/extensions/); do -sed "/Browser Chrome Files/s%$%\n@BINPATH@/browser/extensions/$EXTENSION/*%" -i browser/installer/package-manifest.in mobile/android/installer/package-manifest.in +sed "/Browser Chrome Files/s%$%\n@RESPATH@/browser/extensions/$EXTENSION/*%" -i browser/installer/package-manifest.in +sed "/Browser Chrome Files/s%$%\n@BINPATH@/browser/extensions/$EXTENSION/*%" -i mobile/android/installer/package-manifest.in #echo "DIRS += ['$EXTENSION']" >> browser/app/profile/extensions/moz.build #touch browser/app/profile/extensions/$EXTENSION/moz.build done