From 6577704dba03eebc39fcf479806371b1244b0f97 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 6 Sep 2013 12:35:19 +0200 Subject: [PATCH] Backout changesets 997672af6fc8:cfcf5b7edc53 (bug 880118) for missing build peer review on changeset 9ff14d43346d. --- configure.in | 1 - mobile/android/base/gfx/LayerView.java | 10 ++--- .../mozconfigs/android-armv6/l10n-nightly | 1 - .../mozconfigs/android-armv6/l10n-release | 1 - .../mozconfigs/android-x86/l10n-nightly | 1 - .../mozconfigs/android-x86/l10n-release | 1 - .../config/mozconfigs/android/l10n-nightly | 1 - .../config/mozconfigs/android/l10n-release | 1 - mobile/android/geckoview_library/.classpath | 13 ------ mobile/android/geckoview_library/.project | 33 -------------- .../geckoview_library/AndroidManifest.xml | 17 ------- mobile/android/geckoview_library/Makefile.in | 45 ------------------- mobile/android/geckoview_library/moz.build | 5 --- .../geckoview_library/project.properties | 15 ------- mobile/android/moz.build | 1 - toolkit/mozapps/installer/packager.mk | 11 +---- 16 files changed, 5 insertions(+), 152 deletions(-) delete mode 100644 mobile/android/geckoview_library/.classpath delete mode 100644 mobile/android/geckoview_library/.project delete mode 100644 mobile/android/geckoview_library/AndroidManifest.xml delete mode 100644 mobile/android/geckoview_library/Makefile.in delete mode 100644 mobile/android/geckoview_library/moz.build delete mode 100644 mobile/android/geckoview_library/project.properties diff --git a/configure.in b/configure.in index a7412ab73ab2..0054bf9d702b 100644 --- a/configure.in +++ b/configure.in @@ -8447,7 +8447,6 @@ AC_SUBST(MOZ_METRO) AC_SUBST(MOZ_ANDROID_HISTORY) AC_SUBST(MOZ_WEBSMS_BACKEND) AC_SUBST(MOZ_ANDROID_BEAM) -AC_SUBST(MOZ_DISABLE_GECKOVIEW) AC_SUBST(ENABLE_STRIP) AC_SUBST(PKG_SKIP_STRIP) AC_SUBST(STRIP_FLAGS) diff --git a/mobile/android/base/gfx/LayerView.java b/mobile/android/base/gfx/LayerView.java index c3aa8a4bb32a..842395a2bcf9 100644 --- a/mobile/android/base/gfx/LayerView.java +++ b/mobile/android/base/gfx/LayerView.java @@ -443,20 +443,18 @@ public class LayerView extends FrameLayout { return mGLController; } - private Bitmap getDrawable(String name) { + private Bitmap getDrawable(int resId) { BitmapFactory.Options options = new BitmapFactory.Options(); options.inScaled = false; - Context context = getContext(); - int resId = context.getResources().getIdentifier(name, "drawable", context.getPackageName()); - return BitmapUtils.decodeResource(context, resId, options); + return BitmapUtils.decodeResource(getContext(), resId, options); } Bitmap getShadowPattern() { - return getDrawable("shadow"); + return getDrawable(R.drawable.shadow); } Bitmap getScrollbarImage() { - return getDrawable("scrollbar"); + return getDrawable(R.drawable.scrollbar); } /* When using a SurfaceView (mSurfaceView != null), resizing happens in two diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly index 3bbac064ff35..04fbfac0c332 100644 --- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly +++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly @@ -34,7 +34,6 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_PKG_SPECIAL=armv6 -export MOZ_DISABLE_GECKOVIEW=1 ac_add_options --with-branding=mobile/android/branding/nightly diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-release b/mobile/android/config/mozconfigs/android-armv6/l10n-release index 2b493db2664d..a369cde177ff 100644 --- a/mobile/android/config/mozconfigs/android-armv6/l10n-release +++ b/mobile/android/config/mozconfigs/android-armv6/l10n-release @@ -31,7 +31,6 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_PKG_SPECIAL=armv6 -export MOZ_DISABLE_GECKOVIEW=1 ac_add_options --enable-official-branding ac_add_options --with-branding=mobile/android/branding/beta diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly b/mobile/android/config/mozconfigs/android-x86/l10n-nightly index 80e4328bc00e..a03e4099e958 100644 --- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly +++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly @@ -32,7 +32,6 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 -export MOZ_DISABLE_GECKOVIEW=1 ac_add_options --with-branding=mobile/android/branding/nightly diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-release b/mobile/android/config/mozconfigs/android-x86/l10n-release index 3f717c3a6984..4064f8503775 100644 --- a/mobile/android/config/mozconfigs/android-x86/l10n-release +++ b/mobile/android/config/mozconfigs/android-x86/l10n-release @@ -29,7 +29,6 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 -export MOZ_DISABLE_GECKOVIEW=1 ac_add_options --enable-official-branding ac_add_options --with-branding=mobile/android/branding/beta diff --git a/mobile/android/config/mozconfigs/android/l10n-nightly b/mobile/android/config/mozconfigs/android/l10n-nightly index 021712335fa8..ad3f99d0b3a1 100644 --- a/mobile/android/config/mozconfigs/android/l10n-nightly +++ b/mobile/android/config/mozconfigs/android/l10n-nightly @@ -32,7 +32,6 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 -export MOZ_DISABLE_GECKOVIEW=1 ac_add_options --with-branding=mobile/android/branding/nightly diff --git a/mobile/android/config/mozconfigs/android/l10n-release b/mobile/android/config/mozconfigs/android/l10n-release index 671c52604a26..0143c6b1478d 100644 --- a/mobile/android/config/mozconfigs/android/l10n-release +++ b/mobile/android/config/mozconfigs/android/l10n-release @@ -29,7 +29,6 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 -export MOZ_DISABLE_GECKOVIEW=1 ac_add_options --enable-official-branding ac_add_options --with-branding=mobile/android/branding/beta diff --git a/mobile/android/geckoview_library/.classpath b/mobile/android/geckoview_library/.classpath deleted file mode 100644 index 46d9cf7cbb2f..000000000000 --- a/mobile/android/geckoview_library/.classpath +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/mobile/android/geckoview_library/.project b/mobile/android/geckoview_library/.project deleted file mode 100644 index 6ed69354e958..000000000000 --- a/mobile/android/geckoview_library/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - GeckoView - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/mobile/android/geckoview_library/AndroidManifest.xml b/mobile/android/geckoview_library/AndroidManifest.xml deleted file mode 100644 index 12aed5b1bc5a..000000000000 --- a/mobile/android/geckoview_library/AndroidManifest.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/mobile/android/geckoview_library/Makefile.in b/mobile/android/geckoview_library/Makefile.in deleted file mode 100644 index 129832a1f478..000000000000 --- a/mobile/android/geckoview_library/Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -INSTALL_TARGETS += GECKOVIEW_LIBRARY -GECKOVIEW_LIBRARY_DEST = $(CURDIR) -GECKOVIEW_LIBRARY_FILES := \ - .classpath \ - .project \ - AndroidManifest.xml \ - project.properties \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - -package: - # Make directory for the zips - $(MKDIR) -p $(DIST)/geckoview_library - - # Zip the assets - cd $(DIST)/fennec; \ - $(ZIP) -r ../geckoview_library/geckoview_assets.zip assets - - # Make empty directories to fit an Android project structure - $(MKDIR) -p bin gen libs/$(ABI_DIR) src - - # Copy the JARs - cp ../base/jars/* libs/ - - # Copy the SOs - cp $(DIST)/bin/libmozglue.so $(DIST)/bin/lib/libplugin-container.so libs/$(ABI_DIR)/ - - # Copy the resources - cp -R ../base/res . - - # Zip the directory - cd ..; \ - $(ZIP) -r ../../dist/geckoview_library/geckoview_library.zip geckoview_library --exclude geckoview_library/backend.mk geckoview_library/Makefile diff --git a/mobile/android/geckoview_library/moz.build b/mobile/android/geckoview_library/moz.build deleted file mode 100644 index c271ec3908ce..000000000000 --- a/mobile/android/geckoview_library/moz.build +++ /dev/null @@ -1,5 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/mobile/android/geckoview_library/project.properties b/mobile/android/geckoview_library/project.properties deleted file mode 100644 index 484dab07534a..000000000000 --- a/mobile/android/geckoview_library/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-17 -android.library=true diff --git a/mobile/android/moz.build b/mobile/android/moz.build index d2c29326d7a6..9d4352980971 100644 --- a/mobile/android/moz.build +++ b/mobile/android/moz.build @@ -16,7 +16,6 @@ DIRS += [ 'themes/core', 'app', 'fonts', - 'geckoview_library', ] if not CONFIG['LIBXUL_SDK']: diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 0fe7c54919bb..2acb734bf901 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -344,14 +344,6 @@ else INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Robocop for you' endif -# Create geckoview_library/geckoview_{assets,library}.zip for third-party GeckoView consumers. -ifndef MOZ_DISABLE_GECKOVIEW -INNER_MAKE_GECKOVIEW_LIBRARY= \ - $(MAKE) -C ../mobile/android/geckoview_library package ABI_DIR=$(ABI_DIR) -else -INNER_MAKE_GECKOVIEW_LIBRARY=echo 'GeckoView library packaging is disabled' -endif - ifdef MOZ_OMX_PLUGIN DIST_FILES += libomxplugin.so libomxplugingb.so libomxplugingb235.so libomxpluginhc.so libomxpluginfroyo.so endif @@ -402,8 +394,7 @@ INNER_MAKE_PACKAGE = \ cp $(_ABS_DIST)/gecko.apk $(_ABS_DIST)/gecko-unsigned-unaligned.apk && \ $(RELEASE_JARSIGNER) $(_ABS_DIST)/gecko.apk && \ $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/gecko.apk $(PACKAGE) && \ - $(INNER_ROBOCOP_PACKAGE) && \ - $(INNER_MAKE_GECKOVIEW_LIBRARY) + $(INNER_ROBOCOP_PACKAGE) # Language repacks root the resources contained in assets/omni.ja # under assets/, but the repacks expect them to be rooted at /.