зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1223209 - Remove geckoview_example; r=nalexander r=mfinkle
geckoview_example is broken and obsolete, and we haven't maintained it for a long time. We should remove it from the tree, allow GeckoView AARs to build, and rely on other example GeckoView projects that live on GitHub.
This commit is contained in:
Jim Chen
Родитель
7892cfcede
Коммит
1fbdd6e6fc
|
|
@ -1,23 +0,0 @@
|
|||
#filter substitution
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mozilla.geckoviewexample"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
<uses-sdk android:minSdkVersion="8"
|
||||
android:targetSdkVersion="@ANDROID_TARGET_SDK@"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
|
||||
<application android:label="@string/app_name"
|
||||
android:icon="@drawable/ic_launcher"
|
||||
android:hardwareAccelerated="true">
|
||||
<activity android:name="GeckoViewExample"
|
||||
android:label="@string/app_name">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
</manifest>
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
package org.mozilla.geckoviewexample;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
public class GeckoViewExample extends Activity {
|
||||
/** Called when the activity is first created. */
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.main);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
PP_TARGETS = properties manifest
|
||||
|
||||
manifest = AndroidManifest.xml.in
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
GARBAGE = \
|
||||
AndroidManifest.xml \
|
||||
proguard-project.txt \
|
||||
project.properties \
|
||||
ant.properties \
|
||||
build.xml \
|
||||
local.properties \
|
||||
geckoview_example.apk \
|
||||
$(NULL)
|
||||
|
||||
GARBAGE_DIRS = \
|
||||
assets \
|
||||
geckoview_library \
|
||||
gen \
|
||||
bin \
|
||||
libs \
|
||||
res \
|
||||
src \
|
||||
binaries \
|
||||
$(NULL)
|
||||
|
||||
ANDROID=$(ANDROID_TOOLS)/android
|
||||
|
||||
TARGET="android-$(ANDROID_TARGET_SDK)"
|
||||
|
||||
PACKAGE_DEPS = \
|
||||
assets/libxul.so \
|
||||
build.xml \
|
||||
src/org/mozilla/geckoviewexample/GeckoViewExample.java \
|
||||
$(CURDIR)/res/layout/main.xml \
|
||||
$(CURDIR)/AndroidManifest.xml \
|
||||
$(NULL)
|
||||
|
||||
$(CURDIR)/res/layout/main.xml: $(srcdir)/main.xml
|
||||
$(NSINSTALL) $(srcdir)/main.xml res/layout/
|
||||
|
||||
src/org/mozilla/geckoviewexample/GeckoViewExample.java: $(srcdir)/GeckoViewExample.java
|
||||
$(NSINSTALL) $(srcdir)/GeckoViewExample.java src/org/mozilla/geckoviewexample/
|
||||
|
||||
assets/libxul.so: $(DIST)/geckoview_library/geckoview_assets.zip FORCE
|
||||
$(UNZIP) -o $(DIST)/geckoview_library/geckoview_assets.zip
|
||||
|
||||
build.xml: $(CURDIR)/AndroidManifest.xml
|
||||
mv AndroidManifest.xml AndroidManifest.xml.save
|
||||
$(ANDROID) create project --name GeckoViewExample --target $(TARGET) --path $(CURDIR) --activity GeckoViewExample --package org.mozilla.geckoviewexample
|
||||
$(ANDROID) update project --target $(TARGET) --path $(CURDIR) --library $(DEPTH)/mobile/android/geckoview_library
|
||||
$(RM) $(CURDIR)/res/layout/main.xml
|
||||
$(NSINSTALL) $(srcdir)/main.xml res/layout/
|
||||
$(RM) AndroidManifest.xml
|
||||
mv AndroidManifest.xml.save AndroidManifest.xml
|
||||
echo jar.libs.dir=libs >> project.properties
|
||||
|
||||
bin/GeckoViewExample-debug.apk: $(PACKAGE_DEPS)
|
||||
ant debug
|
||||
|
||||
geckoview_example.apk: bin/GeckoViewExample-debug.apk
|
||||
cp $< $@
|
||||
|
||||
package: geckoview_example.apk FORCE
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:gecko="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
>
|
||||
<org.mozilla.gecko.GeckoView android:id="@+id/gecko_view"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
gecko:url="about:mozilla"/>
|
||||
</LinearLayout>
|
||||
|
|
@ -6,9 +6,6 @@
|
|||
|
||||
DIRS += ['components', 'browser']
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
||||
DIRS += ['android/geckoview_example']
|
||||
|
||||
TEST_DIRS += ['test']
|
||||
|
||||
if CONFIG['ENABLE_TESTS']:
|
||||
|
|
|
|||
|
|
@ -113,6 +113,3 @@ MOZ_ADDON_SIGNING=1
|
|||
# Note: The framework is always included in the app. This flag controls
|
||||
# usage of the framework.
|
||||
MOZ_SWITCHBOARD=1
|
||||
|
||||
# Disable GeckoView by default.
|
||||
export MOZ_DISABLE_GECKOVIEW=1
|
||||
|
|
|
|||
|
|
@ -328,7 +328,6 @@ UPLOAD_EXTRA_FILES += robocop.apk
|
|||
UPLOAD_EXTRA_FILES += fennec_ids.txt
|
||||
UPLOAD_EXTRA_FILES += geckoview_library/geckoview_library.zip
|
||||
UPLOAD_EXTRA_FILES += geckoview_library/geckoview_assets.zip
|
||||
UPLOAD_EXTRA_FILES += ../embedding/android/geckoview_example/geckoview_example.apk
|
||||
|
||||
# Robocop/Robotium tests, Android Background tests, and Fennec need to
|
||||
# be signed with the same key, which means release signing them all.
|
||||
|
|
@ -350,15 +349,11 @@ ifdef NIGHTLY_BUILD
|
|||
ifndef MOZ_DISABLE_GECKOVIEW
|
||||
INNER_MAKE_GECKOVIEW_LIBRARY= \
|
||||
$(MAKE) -C ../mobile/android/geckoview_library package
|
||||
INNER_MAKE_GECKOVIEW_EXAMPLE= \
|
||||
$(MAKE) -C ../embedding/android/geckoview_example package
|
||||
else
|
||||
INNER_MAKE_GECKOVIEW_LIBRARY=echo 'GeckoView library packaging is disabled'
|
||||
INNER_MAKE_GECKOVIEW_EXAMPLE=echo 'GeckoView example packaging is disabled'
|
||||
endif
|
||||
else
|
||||
INNER_MAKE_GECKOVIEW_LIBRARY=echo 'GeckoView library packaging is only enabled on Nightly'
|
||||
INNER_MAKE_GECKOVIEW_EXAMPLE=echo 'GeckoView example packaging is only enabled on Nightly'
|
||||
endif
|
||||
|
||||
# Create Android ARchives and metadata for download by local
|
||||
|
|
@ -490,8 +485,7 @@ INNER_MAKE_PACKAGE = \
|
|||
$(INNER_MAKE_APK) && \
|
||||
$(INNER_ROBOCOP_PACKAGE) && \
|
||||
$(INNER_MAKE_GECKOLIBS_AAR) && \
|
||||
$(INNER_MAKE_GECKOVIEW_LIBRARY) && \
|
||||
$(INNER_MAKE_GECKOVIEW_EXAMPLE)
|
||||
$(INNER_MAKE_GECKOVIEW_LIBRARY)
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_BUILD_APP),mobile/android/b2gdroid)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче