зеркало из https://github.com/mozilla/gecko-dev.git
Backout changesets 997672af6fc8:cfcf5b7edc53 (bug 880118) for missing build peer review on changeset 9ff14d43346d.
This commit is contained in:
Ms2ger
Родитель
8b7d6d5ca2
Коммит
6577704dba
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES">
|
||||
<attributes>
|
||||
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="geckoview_library/libs/armeabi-v7a"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||
<classpathentry kind="output" path="bin/classes"/>
|
||||
</classpath>
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>GeckoView</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mozilla.geckoview"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0" >
|
||||
|
||||
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="8"
|
||||
android:targetSdkVersion="17" />
|
||||
|
||||
</manifest>
|
||||
|
|
@ -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
|
||||
|
|
@ -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/.
|
||||
|
|
@ -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
|
||||
|
|
@ -16,7 +16,6 @@ DIRS += [
|
|||
'themes/core',
|
||||
'app',
|
||||
'fonts',
|
||||
'geckoview_library',
|
||||
]
|
||||
|
||||
if not CONFIG['LIBXUL_SDK']:
|
||||
|
|
|
|||
|
|
@ -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 /.
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче