Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android: com.mozilla to org.mozilla #21830

Merged
merged 1 commit into from Oct 2, 2018
+45 −45
Merged

Android: com.mozilla to org.mozilla #21830

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

6 etc/run_in_headless_android_emulator.py
View file
Open in desktop
@@ -59,7 +59,7 @@ def main(avd_name, apk_path, *args):

json_params = shell_quote(json.dumps(args))
extra = "-e servoargs " + json_params
cmd = "am start " + extra + " com.mozilla.servo/com.mozilla.servo.MainActivity"
cmd = "am start " + extra + " org.mozilla.servo/org.mozilla.servo.MainActivity"
check_call(adb + ["shell", cmd], stdout=sys.stderr)

# Start showing logs as soon as the application starts,
@@ -128,7 +128,7 @@ def check_call(*args, **kwargs):


def write_user_stylesheets(adb, args):
data_dir = "/sdcard/Android/data/com.mozilla.servo/files"
data_dir = "/sdcard/Android/data/org.mozilla.servo/files"
check_call(adb + ["shell", "mkdir -p %s" % data_dir])
for i, (pos, path) in enumerate(extract_args("--user-stylesheet", args)):
remote_path = "%s/user%s.css" % (data_dir, i)
@@ -139,7 +139,7 @@ def write_user_stylesheets(adb, args):
def write_hosts_file(adb):
hosts_file = os.environ.get("HOST_FILE")
if hosts_file:
data_dir = "/sdcard/Android/data/com.mozilla.servo/files"
data_dir = "/sdcard/Android/data/org.mozilla.servo/files"
check_call(adb + ["shell", "mkdir -p %s" % data_dir])
remote_path = data_dir + "/android_hosts"
check_call(adb + ["push", hosts_file, remote_path], stdout=sys.stderr)
36 ports/libsimpleservo/src/jniapi.rs
View file
Open in desktop
@@ -39,14 +39,14 @@ where
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_version(env: JNIEnv, _class: JClass) -> jstring {
pub fn Java_org_mozilla_servoview_JNIServo_version(env: JNIEnv, _class: JClass) -> jstring {
let v = api::servo_version();
let output = env.new_string(v).expect("Couldn't create java string");
output.into_inner()
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_init(
pub fn Java_org_mozilla_servoview_JNIServo_init(
env: JNIEnv,
_: JClass,
activity: JObject,
@@ -122,7 +122,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_init(
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_setBatchMode(
pub fn Java_org_mozilla_servoview_JNIServo_setBatchMode(
env: JNIEnv,
_: JClass,
batch: jboolean,
@@ -132,7 +132,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_setBatchMode(
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_resize(
pub fn Java_org_mozilla_servoview_JNIServo_resize(
env: JNIEnv,
_: JClass,
width: jint,
@@ -143,50 +143,50 @@ pub fn Java_com_mozilla_servoview_JNIServo_resize(
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_performUpdates(env: JNIEnv, _class: JClass) {
pub fn Java_org_mozilla_servoview_JNIServo_performUpdates(env: JNIEnv, _class: JClass) {
debug!("performUpdates");
call(env, |s| s.perform_updates());
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_loadUri(env: JNIEnv, _class: JClass, url: JString) {
pub fn Java_org_mozilla_servoview_JNIServo_loadUri(env: JNIEnv, _class: JClass, url: JString) {
debug!("loadUri");
let url: String = env.get_string(url).unwrap().into();
call(env, |s| s.load_uri(&url));
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_reload(env: JNIEnv, _class: JClass) {
pub fn Java_org_mozilla_servoview_JNIServo_reload(env: JNIEnv, _class: JClass) {
debug!("reload");
call(env, |s| s.reload());
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_stop(env: JNIEnv, _class: JClass) {
pub fn Java_org_mozilla_servoview_JNIServo_stop(env: JNIEnv, _class: JClass) {
debug!("stop");
call(env, |s| s.stop());
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_refresh(env: JNIEnv, _class: JClass) {
pub fn Java_org_mozilla_servoview_JNIServo_refresh(env: JNIEnv, _class: JClass) {
debug!("refresh");
call(env, |s| s.refresh());
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_goBack(env: JNIEnv, _class: JClass) {
pub fn Java_org_mozilla_servoview_JNIServo_goBack(env: JNIEnv, _class: JClass) {
debug!("goBack");
call(env, |s| s.go_back());
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_goForward(env: JNIEnv, _class: JClass) {
pub fn Java_org_mozilla_servoview_JNIServo_goForward(env: JNIEnv, _class: JClass) {
debug!("goForward");
call(env, |s| s.go_forward());
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_scrollStart(
pub fn Java_org_mozilla_servoview_JNIServo_scrollStart(
env: JNIEnv,
_: JClass,
dx: jint,
@@ -199,7 +199,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_scrollStart(
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_scrollEnd(
pub fn Java_org_mozilla_servoview_JNIServo_scrollEnd(
env: JNIEnv,
_: JClass,
dx: jint,
@@ -213,7 +213,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_scrollEnd(


#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_scroll(
pub fn Java_org_mozilla_servoview_JNIServo_scroll(
env: JNIEnv,
_: JClass,
dx: jint,
@@ -226,7 +226,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_scroll(
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_pinchZoomStart(
pub fn Java_org_mozilla_servoview_JNIServo_pinchZoomStart(
env: JNIEnv,
_: JClass,
factor: jfloat,
@@ -238,7 +238,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_pinchZoomStart(
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_pinchZoom(
pub fn Java_org_mozilla_servoview_JNIServo_pinchZoom(
env: JNIEnv,
_: JClass,
factor: jfloat,
@@ -250,7 +250,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_pinchZoom(
}

#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_pinchZoomEnd(
pub fn Java_org_mozilla_servoview_JNIServo_pinchZoomEnd(
env: JNIEnv,
_: JClass,
factor: jfloat,
@@ -263,7 +263,7 @@ pub fn Java_com_mozilla_servoview_JNIServo_pinchZoomEnd(


#[no_mangle]
pub fn Java_com_mozilla_servoview_JNIServo_click(env: JNIEnv, _: JClass, x: jint, y: jint) {
pub fn Java_org_mozilla_servoview_JNIServo_click(env: JNIEnv, _: JClass, x: jint, y: jint) {
debug!("click");
call(env, |s| s.click(x as u32, y as u32));
}
2 python/servo/devenv_commands.py
View file
Open in desktop
@@ -318,7 +318,7 @@ def ndk_gdb(self, release, target):
ndk_gdb,
"--adb", adb_path,
"--project", "support/android/apk/servoapp/src/main/",
"--launch", "com.mozilla.servo.MainActivity",
"--launch", "org.mozilla.servo.MainActivity",
"-x", f.name,
"--verbose",
], env=env)
6 python/servo/post_build_commands.py
View file
Open in desktop
@@ -95,17 +95,17 @@ def run(self, params, release=False, dev=False, android=None, debug=False, debug
print("https://github.com/servo/servo/wiki/Building-for-Android#debugging-on-device")
return
script = [
"am force-stop com.mozilla.servo",
"am force-stop org.mozilla.servo",
]
json_params = shell_quote(json.dumps(params))
extra = "-e servoargs " + json_params
rust_log = env.get("RUST_LOG", None)
if rust_log:
extra += " -e servolog " + rust_log
script += [
"am start " + extra + " com.mozilla.servo/com.mozilla.servo.MainActivity",
"am start " + extra + " org.mozilla.servo/org.mozilla.servo.MainActivity",
"sleep 0.5",
"echo Servo PID: $(pidof com.mozilla.servo)",
"echo Servo PID: $(pidof org.mozilla.servo)",
"exit"
]
args = [self.android_adb_path(env)]
2 support/android/apk/servoapp/build.gradle
View file
Open in desktop
@@ -10,7 +10,7 @@ android {
buildDir = rootDir.absolutePath + "/../../../target/gradle/servoapp"

defaultConfig {
applicationId "com.mozilla.servo"
applicationId "org.mozilla.servo"
minSdkVersion 18
targetSdkVersion 27
versionCode 1
2 support/android/apk/servoapp/src/main/AndroidManifest.xml
View file
Open in desktop
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"
package="com.mozilla.servo">
package="org.mozilla.servo">

<uses-feature android:glEsVersion="0x00030000" android:required="true" />
<uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>
6 .../java/com/mozilla/servo/MainActivity.java → .../java/org/mozilla/servo/MainActivity.java
View file
Open in desktop
@@ -3,7 +3,7 @@
* 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/. */

package com.mozilla.servo;
package org.mozilla.servo;

import android.app.Activity;
import android.content.Context;
@@ -20,8 +20,8 @@
import android.widget.ProgressBar;
import android.widget.TextView;

import com.mozilla.servoview.ServoView;
import com.mozilla.servoview.Servo;
import org.mozilla.servoview.ServoView;
import org.mozilla.servoview.Servo;

import java.io.File;

4 support/android/apk/servoapp/src/main/res/layout/activity_main.xml
View file
Open in desktop
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.mozilla.servo.MainActivity">
tools:context="org.mozilla.servo.MainActivity">

<LinearLayout
android:layout_width="0dp"
@@ -95,7 +95,7 @@

</LinearLayout>

<com.mozilla.servoview.ServoView
<org.mozilla.servoview.ServoView
android:id="@+id/servoview"
android:layout_width="match_parent"
android:layout_height="match_parent"
2 support/android/apk/servoview/src/googlevr/AndroidManifest.xml
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mozilla.servoview">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.servoview">
<application>
<activity android:name=".MainActivity"
android:screenOrientation="landscape"
2 support/android/apk/servoview/src/main/AndroidManifest.xml
View file
Open in desktop
@@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mozilla.servoview" />
package="org.mozilla.servoview" />
2 .../java/com/mozilla/servoview/JNIServo.java → .../java/org/mozilla/servoview/JNIServo.java
View file
Open in desktop
@@ -3,7 +3,7 @@
* 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/. */

package com.mozilla.servoview;
package org.mozilla.servoview;

import android.app.Activity;

2 ...ain/java/com/mozilla/servoview/Servo.java → ...ain/java/org/mozilla/servoview/Servo.java
View file
Open in desktop
@@ -3,7 +3,7 @@
* 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/. */

package com.mozilla.servoview;
package org.mozilla.servoview;

import android.app.Activity;
import android.content.res.AssetManager;
8 ...a/com/mozilla/servoview/ServoSurface.java → ...a/org/mozilla/servoview/ServoSurface.java
View file
Open in desktop
@@ -3,7 +3,7 @@
* 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/. */

package com.mozilla.servoview;
package org.mozilla.servoview;

import android.annotation.SuppressLint;
import android.app.Activity;
@@ -20,9 +20,9 @@
import android.util.Log;
import android.view.Surface;

import com.mozilla.servoview.Servo.Client;
import com.mozilla.servoview.Servo.GfxCallbacks;
import com.mozilla.servoview.Servo.RunCallback;
import org.mozilla.servoview.Servo.Client;
import org.mozilla.servoview.Servo.GfxCallbacks;
import org.mozilla.servoview.Servo.RunCallback;

import static android.opengl.EGL14.EGL_CONTEXT_CLIENT_VERSION;
import static android.opengl.EGL14.EGL_OPENGL_ES2_BIT;
8 ...java/com/mozilla/servoview/ServoView.java → ...java/org/mozilla/servoview/ServoView.java
View file
Open in desktop
@@ -3,7 +3,7 @@
* 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/. */

package com.mozilla.servoview;
package org.mozilla.servoview;

import android.app.Activity;
import android.content.Context;
@@ -19,9 +19,9 @@
import android.view.ScaleGestureDetector;
import android.widget.OverScroller;

import com.mozilla.servoview.Servo.Client;
import com.mozilla.servoview.Servo.GfxCallbacks;
import com.mozilla.servoview.Servo.RunCallback;
import org.mozilla.servoview.Servo.Client;
import org.mozilla.servoview.Servo.GfxCallbacks;
import org.mozilla.servoview.Servo.RunCallback;

import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
2 support/android/apk/servoview/src/oculusvr/AndroidManifest.xml
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mozilla.servoview">>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.servoview">>
<application>
<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
<activity android:name=".MainActivity" android:screenOrientation="landscape">
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.