Backed out 2 changesets (bug 1585661) for causing lint failures. CLOSED TREE
authorMihai Alexandru Michis <malexandru@mozilla.com>
Thu, 14 Nov 2019 17:50:28 +0200
changeset 501985 2fe825d522b2dd34a5f97bbae9d2aa251540123e
parent 501984 6e3d285d14eeffbf8861d39c664b796bd9640322
child 501986 8b0098a03143ee4f81ae2f78d31ac960a62c1a8c
push id100535
push usermalexandru@mozilla.com
push dateThu, 14 Nov 2019 15:51:27 +0000
treeherderautoland@2fe825d522b2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1585661
milestone72.0a1
backs out915910348bceea4cf865693859da04efabb12d22
126b374778190a9fe47ba3b6077f89309a15c270
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1585661) for causing lint failures. CLOSED TREE Backed out changeset 915910348bce (bug 1585661) Backed out changeset 126b37477819 (bug 1585661)
mobile/android/docs/Gemfile
mobile/android/docs/_config.yml
mobile/android/docs/geckoview/Gemfile
mobile/android/docs/geckoview/README.md
mobile/android/docs/geckoview/_config.yml
mobile/android/examples/extensions/messaging_example/app/.gitignore
mobile/android/examples/extensions/messaging_example/app/build.gradle
mobile/android/examples/extensions/messaging_example/app/src/main/AndroidManifest.xml
mobile/android/examples/extensions/messaging_example/app/src/main/assets/messaging/manifest.json
mobile/android/examples/extensions/messaging_example/app/src/main/assets/messaging/messaging.js
mobile/android/examples/extensions/messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java
mobile/android/examples/extensions/messaging_example/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
mobile/android/examples/extensions/messaging_example/app/src/main/res/drawable/ic_launcher_background.xml
mobile/android/examples/extensions/messaging_example/app/src/main/res/layout/activity_main.xml
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-hdpi/ic_launcher.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-mdpi/ic_launcher.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-xhdpi/ic_launcher.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
mobile/android/examples/extensions/messaging_example/app/src/main/res/values/colors.xml
mobile/android/examples/extensions/messaging_example/app/src/main/res/values/strings.xml
mobile/android/examples/extensions/messaging_example/app/src/main/res/values/styles.xml
mobile/android/examples/extensions/port_messaging_example/app/.gitignore
mobile/android/examples/extensions/port_messaging_example/app/build.gradle
mobile/android/examples/extensions/port_messaging_example/app/src/main/AndroidManifest.xml
mobile/android/examples/extensions/port_messaging_example/app/src/main/assets/messaging/background.js
mobile/android/examples/extensions/port_messaging_example/app/src/main/assets/messaging/manifest.json
mobile/android/examples/extensions/port_messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/drawable/ic_launcher_background.xml
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/layout/activity_main.xml
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-hdpi/ic_launcher.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-mdpi/ic_launcher.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-xhdpi/ic_launcher.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/values/colors.xml
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/values/strings.xml
mobile/android/examples/extensions/port_messaging_example/app/src/main/res/values/styles.xml
mobile/android/mach_commands.py
settings.gradle
testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
rename from mobile/android/docs/Gemfile
rename to mobile/android/docs/geckoview/Gemfile
new file mode 100644
--- /dev/null
+++ b/mobile/android/docs/geckoview/README.md
@@ -0,0 +1,41 @@
+This GitHub repository contains the documentation for [GeckoView][8]. If you are looking for the code for GeckoView you can find it at [Mozilla Central][9].
+
+If there is documentation that you feel is missing, or an existing document doesn't cover the aspect that you are looking for, please request it by [raising an issue][10].
+
+If you have a GeckoView bug that you want to raise, please do so on our [Bugzilla][11].
+
+## Get Started with GeckoView
+
+* [GeckoView Quick Start Guide][1]
+* [Interacting with Web content and WebExtension][7]
+
+
+## API Documentation
+
+* [Changelog][2]
+* [API][12]
+
+## Get Started as a Contributor
+
+* [GeckoView Contributor Quick Start Guide][3]
+* [Mozilla Central Quick Start Guide][4]
+* [Mozilla Central Contributor Guide][5]
+* [Guide to Native Debugging in Android Studio][6]
+
+
+## More information
+You can read more about GeckoView on the [wiki](https://wiki.mozilla.org/Mobile/GeckoView).
+
+
+[1]:https://geckoview.dev/consumer/docs/geckoview-quick-start
+[2]:https://geckoview.dev/javadoc/mozilla-central/org/mozilla/geckoview/doc-files/CHANGELOG
+[3]:https://geckoview.dev/contributor/geckoview-quick-start
+[4]:https://geckoview.dev/contributor/mc-quick-start
+[5]:https://geckoview.dev/contributor/contributing-to-mc
+[6]:https://geckoview.dev/contributor/native-debugging
+[7]:https://geckoview.dev/consumer/docs/web-extensions
+[8]:https://geckoview.dev
+[9]:https://searchfox.org/mozilla-central/source/mobile/android/geckoview
+[10]:https://github.com/mozilla/geckoview/issues
+[11]:https://bugzilla.mozilla.org/enter_bug.cgi?product=GeckoView
+[12]:https://geckoview.dev/javadoc/mozilla-central/index.html
rename from mobile/android/docs/_config.yml
rename to mobile/android/docs/geckoview/_config.yml
--- a/mobile/android/docs/_config.yml
+++ b/mobile/android/docs/geckoview/_config.yml
@@ -11,10 +11,8 @@ tags: [GeckoView,Gecko,mozilla,android,W
 # Build settings
 markdown: kramdown
 remote_theme: pmarsceill/just-the-docs@aa0d8f1d400b051c090b04b3e530c2848afb585c
 plugins:
   - jekyll-feed
   - jekyll-seo-tag
 
 search_enabled: true
-
-source: ./geckoview
\ No newline at end of file
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/.gitignore
+++ /dev/null
@@ -1,1 +0,0 @@
-/build
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/build.gradle
+++ /dev/null
@@ -1,51 +0,0 @@
-buildDir "${topobjdir}/gradle/build/mobile/android/examples/messaging_example"
-
-apply plugin: 'com.android.application'
-
-apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-
-android {
-    compileSdkVersion project.ext.compileSdkVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    defaultConfig {
-        applicationId "org.mozilla.geckoview.example.messaging"
-        targetSdkVersion project.ext.targetSdkVersion
-        minSdkVersion project.ext.minSdkVersion
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    // By default the android plugins ignores folders that start with `_`, but
-    // we need those in web extensions.
-    // See also:
-    //  - https://issuetracker.google.com/issues/36911326
-    //  - https://stackoverflow.com/questions/9206117/how-to-workaround-autoomitting-fiiles-folders-starting-with-underscore-in
-    aaptOptions {
-        ignoreAssetsPattern  '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
-    }
-
-    project.configureProductFlavors.delegate = it
-    project.configureProductFlavors()
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:support-annotations:$support_library_version"
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation project(path: ':geckoview')
-}
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.geckoview.example.messaging">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/assets/messaging/manifest.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "manifest_version": 2,
-  "name": "messaging",
-  "version": "1.0",
-  "description": "Example messaging web extension.",
-  "content_scripts": [
-    {
-      "matches": ["*://*.twitter.com/*"],
-      "js": ["messaging.js"]
-    }
-  ],
-  "permissions": [
-    "nativeMessaging",
-    "geckoViewAddons"
-  ]
-}
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/assets/messaging/messaging.js
+++ /dev/null
@@ -1,14 +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/. */
-
-let manifest = document.querySelector("head > link[rel=manifest]");
-let browser = window.docShell.chromeEventHandler;
-if (manifest) {
-  fetch(manifest.href)
-    .then(response => response.json())
-    .then(json => {
-      let message = { type: "WPAManifest", manifest: json };
-      browser.runtime.sendNativeMessage("browser", message);
-    });
-}
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.mozilla.geckoview.example.messaging;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.util.Log;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.mozilla.geckoview.GeckoResult;
-import org.mozilla.geckoview.GeckoRuntime;
-import org.mozilla.geckoview.GeckoSession;
-import org.mozilla.geckoview.GeckoView;
-import org.mozilla.geckoview.WebExtension;
-
-public class MainActivity extends AppCompatActivity {
-    private static GeckoRuntime sRuntime;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        GeckoView view = findViewById(R.id.geckoview);
-        GeckoSession session = new GeckoSession();
-
-        if (sRuntime == null) {
-            sRuntime = GeckoRuntime.create(this);
-        }
-
-        WebExtension.MessageDelegate messageDelegate = new WebExtension.MessageDelegate() {
-            @Nullable
-            public GeckoResult<Object> onMessage(final @NonNull Object message,
-                                                 final @NonNull WebExtension.MessageSender sender) {
-                if (message instanceof JSONObject) {
-                    JSONObject json = (JSONObject) message;
-                    try {
-                        if (json.has("type") && "WPAManifest".equals(json.getString("type"))) {
-                            JSONObject manifest = json.getJSONObject("manifest");
-                            Log.d("MessageDelegate", "Found WPA manifest: " + manifest);
-                        }
-                    } catch (JSONException ex) {
-                        Log.e("MessageDelegate", "Invalid manifest", ex);
-                    }
-                }
-                return null;
-            }
-        };
-
-        WebExtension extension = new WebExtension(
-                "resource://android/assets/messaging/",
-                "myextension",
-                WebExtension.Flags.ALLOW_CONTENT_MESSAGING);
-
-        sRuntime.registerWebExtension(extension).exceptionally(e -> {
-            Log.e("MessageDelegate", "Error registering WebExtension", e);
-            return null;
-        });
-
-        session.setMessageDelegate(extension, messageDelegate, "browser");
-
-        session.open(sRuntime);
-        view.setSession(session);
-        session.loadUri("https://mobile.twitter.com");
-    }
-}
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#008577"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <org.mozilla.geckoview.GeckoView
-        android:id="@+id/geckoview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
deleted file mode 100644
index 898f3ed59ac9f3248734a00e5902736c9367d455..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index dffca3601eba7bf5f409bdd520820e2eb5122c75..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 64ba76f75e9ce021aa3d95c213491f73bcacb597..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index dae5e082342fcdeee5db8a6e0b27028e2d2808f5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e5ed46597ea8447d91ab1786a34e30f1c26b18bd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 14ed0af35023e4f1901cf03487b6c524257b8483..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b0907cac3bfd8fbfdc46e1108247f0a1055387ec..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d8ae03154975f397f8ed1b84f2d4bf9783ecfa26..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2c18de9e66108411737e910f5c1972476f03ddbf..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index beed3cdd2c32af5114a7dc70b9ef5b698eb8797e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
-</resources>
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">MessagingExample</string>
-</resources>
deleted file mode 100644
--- a/mobile/android/examples/extensions/messaging_example/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/.gitignore
+++ /dev/null
@@ -1,1 +0,0 @@
-/build
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/build.gradle
+++ /dev/null
@@ -1,51 +0,0 @@
-buildDir "${topobjdir}/gradle/build/mobile/android/examples/port_messaging_example"
-
-apply plugin: 'com.android.application'
-
-apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-
-android {
-    compileSdkVersion project.ext.compileSdkVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    defaultConfig {
-        applicationId "org.mozilla.geckoview.example.messaging"
-        targetSdkVersion project.ext.targetSdkVersion
-        minSdkVersion project.ext.minSdkVersion
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    // By default the android plugins ignores folders that start with `_`, but
-    // we need those in web extensions.
-    // See also:
-    //  - https://issuetracker.google.com/issues/36911326
-    //  - https://stackoverflow.com/questions/9206117/how-to-workaround-autoomitting-fiiles-folders-starting-with-underscore-in
-    aaptOptions {
-        ignoreAssetsPattern  '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
-    }
-
-    project.configureProductFlavors.delegate = it
-    project.configureProductFlavors()
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:support-annotations:$support_library_version"
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation project(path: ':geckoview')
-}
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.geckoview.example.messaging">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/assets/messaging/background.js
+++ /dev/null
@@ -1,12 +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/. */
-
-// Establish connection with app
-let browser = window.docShell.chromeEventHandler;
-let port = browser.runtime.connectNative("browser");
-port.onMessage.addListener(response => {
-  // Let's just echo the message back
-  port.postMessage(`Received: ${JSON.stringify(response)}`);
-});
-port.postMessage("Hello from WebExtension!");
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/assets/messaging/manifest.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "manifest_version": 2,
-  "name": "messaging",
-  "version": "1.0",
-  "description": "Example messaging web extension.",
-  "background": {
-    "scripts": ["background.js"]
-  },
-  "permissions": [
-    "nativeMessaging",
-    "geckoViewAddons"
-  ]
-}
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/java/org/mozilla/geckoview/example/messaging/MainActivity.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.mozilla.geckoview.example.messaging;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.mozilla.geckoview.GeckoResult;
-import org.mozilla.geckoview.GeckoRuntime;
-import org.mozilla.geckoview.GeckoSession;
-import org.mozilla.geckoview.GeckoView;
-import org.mozilla.geckoview.WebExtension;
-
-public class MainActivity extends AppCompatActivity {
-    private static GeckoRuntime sRuntime;
-
-    private WebExtension.Port mPort;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        GeckoView view = findViewById(R.id.geckoview);
-        GeckoSession session = new GeckoSession();
-
-        if (sRuntime == null) {
-            sRuntime = GeckoRuntime.create(this);
-        }
-
-        WebExtension.PortDelegate portDelegate = new WebExtension.PortDelegate() {
-            public WebExtension.Port port = null;
-
-            public void onPortMessage(final @NonNull Object message,
-                                      final @NonNull WebExtension.Port port) {
-                Log.d("PortDelegate", "Received message from WebExtension: "
-                        + message);
-            }
-
-            public void onDisconnect(final @NonNull WebExtension.Port port) {
-                // This port is not usable anymore.
-                if (port == mPort) {
-                    mPort = null;
-                }
-            }
-        };
-
-        WebExtension.MessageDelegate messageDelegate = new WebExtension.MessageDelegate() {
-            @Nullable
-            public void onConnect(final @NonNull WebExtension.Port port) {
-                mPort = port;
-                mPort.setDelegate(portDelegate);
-            }
-        };
-
-        WebExtension extension = new WebExtension(
-                "resource://android/assets/messaging/");
-
-        extension.setMessageDelegate(messageDelegate, "browser");
-
-        sRuntime.registerWebExtension(extension).exceptionally(e -> {
-            Log.e("MessageDelegate", "Error registering WebExtension", e);
-            return null;
-        });
-
-        session.open(sRuntime);
-        view.setSession(session);
-        session.loadUri("https://mobile.twitter.com");
-    }
-
-    @Override
-    public boolean onKeyLongPress(int keyCode, KeyEvent event) {
-        if (mPort == null) {
-            // No WebExtension registered yet, let's ignore this message
-            return false;
-        }
-
-        JSONObject message = new JSONObject();
-        try {
-            message.put("keyCode", keyCode);
-            message.put("event", KeyEvent.keyCodeToString(event.getKeyCode()));
-        } catch (JSONException ex) {
-            throw new RuntimeException(ex);
-        }
-
-        mPort.postMessage(message);
-        return true;
-    }
-}
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#008577"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <org.mozilla.geckoview.GeckoView
-        android:id="@+id/geckoview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
deleted file mode 100644
index 898f3ed59ac9f3248734a00e5902736c9367d455..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index dffca3601eba7bf5f409bdd520820e2eb5122c75..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 64ba76f75e9ce021aa3d95c213491f73bcacb597..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index dae5e082342fcdeee5db8a6e0b27028e2d2808f5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e5ed46597ea8447d91ab1786a34e30f1c26b18bd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 14ed0af35023e4f1901cf03487b6c524257b8483..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b0907cac3bfd8fbfdc46e1108247f0a1055387ec..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d8ae03154975f397f8ed1b84f2d4bf9783ecfa26..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2c18de9e66108411737e910f5c1972476f03ddbf..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index beed3cdd2c32af5114a7dc70b9ef5b698eb8797e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
-</resources>
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">MessagingExample</string>
-</resources>
deleted file mode 100644
--- a/mobile/android/examples/extensions/port_messaging_example/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -1,14 +1,13 @@
 # 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/.
 
 from __future__ import absolute_import, print_function, unicode_literals
-from distutils.file_util import copy_file
 
 import argparse
 import logging
 import os
 
 import mozpack.path as mozpath
 
 from mozbuild.base import (
@@ -185,28 +184,25 @@ REMOVED/DEPRECATED: Use 'mach lint --lin
 
         return 0
 
     @SubCommand('android', 'geckoview-docs',
                 """Create GeckoView javadoc and optionally upload to Github""")
     @CommandArgument('--archive', action='store_true',
                      help='Generate a javadoc archive.')
     @CommandArgument('--upload', metavar='USER/REPO',
-                     help='Upload geckoview documentation to Github, '
+                     help='Upload generated javadoc to Github, '
                      'using the specified USER/REPO.')
     @CommandArgument('--upload-branch', metavar='BRANCH[/PATH]',
-                     default='gh-pages',
-                     help='Use the specified branch/path for documentation commits.')
-    @CommandArgument('--javadoc-path', metavar='/PATH',
-                     default='javadoc',
-                     help='Use the specified path for javadoc commits.')
+                     default='gh-pages/javadoc',
+                     help='Use the specified branch/path for commits.')
     @CommandArgument('--upload-message', metavar='MSG',
                      default='GeckoView docs upload',
                      help='Use the specified message for commits.')
-    def android_geckoview_docs(self, archive, upload, upload_branch, javadoc_path,
+    def android_geckoview_docs(self, archive, upload, upload_branch,
                                upload_message):
 
         tasks = (self.substs['GRADLE_ANDROID_GECKOVIEW_DOCS_ARCHIVE_TASKS'] if archive or upload
                  else self.substs['GRADLE_ANDROID_GECKOVIEW_DOCS_TASKS'])
 
         ret = self.gradle(tasks, verbose=True)
         if ret or not upload:
             return ret
@@ -236,61 +232,43 @@ REMOVED/DEPRECATED: Use 'mach lint --lin
                 f.write(req.json()['secret']['content'])
 
             # Turn off strict host key checking so ssh does not complain about
             # unknown github.com host. We're not pushing anything sensitive, so
             # it's okay to not check GitHub's host keys.
             env['GIT_SSH_COMMAND'] = 'ssh -i "%s" -o StrictHostKeyChecking=no' % keyfile
 
         # Clone remote repo.
-        branch = upload_branch.format(**fmt)
+        branch, _, branch_path = upload_branch.partition('/')
         repo_url = 'git@github.com:%s.git' % upload
         repo_path = mozpath.abspath('gv-docs-repo')
-        self.run_process(['git', 'clone', '--branch', upload_branch, '--depth', '1',
+        self.run_process(['git', 'clone', '--branch', branch, '--depth', '1',
                           repo_url, repo_path], append_env=env, pass_thru=True)
         env['GIT_DIR'] = mozpath.join(repo_path, '.git')
         env['GIT_WORK_TREE'] = repo_path
         env['GIT_AUTHOR_NAME'] = env['GIT_COMMITTER_NAME'] = 'GeckoView Docs Bot'
         env['GIT_AUTHOR_EMAIL'] = env['GIT_COMMITTER_EMAIL'] = 'nobody@mozilla.com'
 
-        # Copy over user documentation.
+        # Extract new javadoc to specified directory inside repo.
         import mozfile
-
-        docs_path = mozpath.join(self.topsrcdir, 'mobile', 'android', 'docs')
-
-        # Some files need to be in the GH repo root folder and should be
-        # copied over directly
-        root_docs = ["_config.yml", "Gemfile"]
-        for filename in root_docs:
-            src_filepath = mozpath.join(docs_path, filename)
-            dst_filepath = mozpath.join(repo_path, filename)
-            copy_file(src_filepath, dst_filepath, update=1)
-
-        # Remove existing geckoview docs and replace with the local copy
-        src_path = mozpath.join(docs_path, 'geckoview')
-        docs_path = mozpath.join(repo_path, 'geckoview')
-        mozfile.remove(docs_path)
-        os.system("rsync -aruz {} {}".format(src_path, repo_path))
-
-        # Extract new javadoc to specified directory inside repo.
         src_tar = mozpath.join(self.topobjdir, 'gradle', 'build', 'mobile', 'android',
                                'geckoview', 'libs', 'geckoview-javadoc.jar')
-        dst_path = mozpath.join(docs_path, javadoc_path)
+        dst_path = mozpath.join(repo_path, branch_path.format(**fmt))
         mozfile.remove(dst_path)
         mozfile.extract_zip(src_tar, dst_path)
 
         # Commit and push.
         self.run_process(['git', 'add', '--all'], append_env=env, pass_thru=True)
         if self.run_process(['git', 'diff', '--cached', '--quiet'],
                             append_env=env, pass_thru=True, ensure_exit_code=False) != 0:
             # We have something to commit.
             self.run_process(['git', 'commit',
                               '--message', upload_message.format(**fmt)],
                              append_env=env, pass_thru=True)
-            self.run_process(['git', 'push', 'origin', branch],
+            self.run_process(['git', 'push', 'origin', 'gh-pages'],
                              append_env=env, pass_thru=True)
 
         mozfile.remove(repo_path)
         if secret:
             mozfile.remove(keyfile)
         return 0
 
     @Command('gradle', category='devenv',
--- a/settings.gradle
+++ b/settings.gradle
@@ -38,28 +38,22 @@ if (json.substs.MOZ_BUILD_APP != 'mobile
 // local.properties (first 'sdk.dir', then 'android.dir') and then the
 // environment variable ANDROID_HOME will override this.  That's unfortunate,
 // but it's hard to automatically arrange better.
 System.setProperty('android.home', json.substs.ANDROID_SDK_ROOT)
 
 include ':annotations'
 include ':geckoview'
 include ':geckoview_example'
-include ':messaging_example'
 include ':omnijar'
-include ':port_messaging_example'
-include ':thirdparty'
 
 project(':annotations').projectDir = new File("${json.topsrcdir}/mobile/android/annotations")
 project(':geckoview').projectDir = new File("${json.topsrcdir}/mobile/android/geckoview")
 project(':geckoview_example').projectDir = new File("${json.topsrcdir}/mobile/android/geckoview_example")
-project(':messaging_example').projectDir = new File("${json.topsrcdir}/mobile/android/examples/extensions/messaging_example/app")
 project(':omnijar').projectDir = new File("${json.topsrcdir}/mobile/android/app/omnijar")
-project(':port_messaging_example').projectDir = new File("${json.topsrcdir}/mobile/android/examples/extensions/port_messaging_example/app")
-project(':thirdparty').projectDir = new File("${json.topsrcdir}/mobile/android/thirdparty")
 
 // The Gradle instance is shared between settings.gradle and all the
 // other build.gradle files (see
 // http://forums.gradle.org/gradle/topics/define_extension_properties_from_settings_xml).
 // We use this ext property to pass the per-object-directory mozconfig
 // between scripts.  This lets us execute set-up code before we gradle
 // tries to configure the project even once, and as a side benefit
 // saves invoking |mach environment| multiple times.
@@ -67,9 +61,9 @@ gradle.ext.mozconfig = json
 
 // Produced by `mach build`.  Bug 1543982: the mozconfig determined by `mach
 // environment` above can be different because `mach build` itself sets certain
 // critical environment variables including MOZ_OBJDIR, CC, and CXX.  We use
 // this record to patch up the environment when we recursively invoke `mach
 // build ...` commands from within Gradle.  This avoids invalidating configure
 // based on the changed environment variables.
 def orig = slurper.parse(new File(json.topobjdir, '.mozconfig.json'))
-gradle.ext.mozconfig.orig_mozconfig = orig.mozconfig
\ No newline at end of file
+gradle.ext.mozconfig.orig_mozconfig = orig.mozconfig
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
@@ -4,15 +4,14 @@ config = {
     'multi_locale_config_platform': 'android',
     # geckoview-docs doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'geckoview-docs',
          '--archive',
          '--upload', 'mozilla/geckoview',
-         '--upload-branch', 'gh-pages'
-         '--javadoc-path', 'javadoc/{project}',
-         '--upload-message', 'Update {project} documentation to rev {revision}',
+         '--upload-branch', 'gh-pages/javadoc/{project}',
+         '--upload-message', 'Update {project} javadoc to rev {revision}',
         ],
     ],
     'max_build_output_timeout': 0,
 }