diff --git a/etc/run_in_headless_android_emulator.py b/etc/run_in_headless_android_emulator.py index c76ea3b71e78..a3b5d573ef95 100755 --- a/etc/run_in_headless_android_emulator.py +++ b/etc/run_in_headless_android_emulator.py @@ -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) diff --git a/ports/libsimpleservo/src/jniapi.rs b/ports/libsimpleservo/src/jniapi.rs index 70a656527270..9470f8c59c27 100644 --- a/ports/libsimpleservo/src/jniapi.rs +++ b/ports/libsimpleservo/src/jniapi.rs @@ -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)); } diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index a357efa9a960..71181220b76f 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -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) diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index 656e230c732a..dc2731c03186 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -95,7 +95,7 @@ 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 @@ -103,9 +103,9 @@ def run(self, params, release=False, dev=False, android=None, debug=False, debug 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)] diff --git a/support/android/apk/servoapp/build.gradle b/support/android/apk/servoapp/build.gradle index abb49af4b1a8..a51576c6f620 100644 --- a/support/android/apk/servoapp/build.gradle +++ b/support/android/apk/servoapp/build.gradle @@ -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 diff --git a/support/android/apk/servoapp/src/main/AndroidManifest.xml b/support/android/apk/servoapp/src/main/AndroidManifest.xml index 727b68871ec5..65ee875e32de 100644 --- a/support/android/apk/servoapp/src/main/AndroidManifest.xml +++ b/support/android/apk/servoapp/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="org.mozilla.servo"> diff --git a/support/android/apk/servoapp/src/main/java/com/mozilla/servo/MainActivity.java b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java similarity index 98% rename from support/android/apk/servoapp/src/main/java/com/mozilla/servo/MainActivity.java rename to support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java index af0f27a92b2a..430bb39ec2e9 100644 --- a/support/android/apk/servoapp/src/main/java/com/mozilla/servo/MainActivity.java +++ b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java @@ -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; diff --git a/support/android/apk/servoapp/src/main/res/layout/activity_main.xml b/support/android/apk/servoapp/src/main/res/layout/activity_main.xml index b8ae7fb94c3c..2cfb3357a01f 100644 --- a/support/android/apk/servoapp/src/main/res/layout/activity_main.xml +++ b/support/android/apk/servoapp/src/main/res/layout/activity_main.xml @@ -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"> - - + + package="org.mozilla.servoview" /> diff --git a/support/android/apk/servoview/src/main/java/com/mozilla/servoview/JNIServo.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java similarity index 98% rename from support/android/apk/servoview/src/main/java/com/mozilla/servoview/JNIServo.java rename to support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java index 2d251c12a34f..a48085ea628b 100644 --- a/support/android/apk/servoview/src/main/java/com/mozilla/servoview/JNIServo.java +++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java @@ -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; diff --git a/support/android/apk/servoview/src/main/java/com/mozilla/servoview/Servo.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java similarity index 99% rename from support/android/apk/servoview/src/main/java/com/mozilla/servoview/Servo.java rename to support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java index 694442a1a07f..f93c5105f148 100644 --- a/support/android/apk/servoview/src/main/java/com/mozilla/servoview/Servo.java +++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java @@ -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; diff --git a/support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoSurface.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoSurface.java similarity index 97% rename from support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoSurface.java rename to support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoSurface.java index 357199047271..95e55e58131f 100644 --- a/support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoSurface.java +++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoSurface.java @@ -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; diff --git a/support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoView.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java similarity index 98% rename from support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoView.java rename to support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java index afb8b0d30a7f..ac5f41f0d3ff 100644 --- a/support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoView.java +++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java @@ -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; diff --git a/support/android/apk/servoview/src/oculusvr/AndroidManifest.xml b/support/android/apk/servoview/src/oculusvr/AndroidManifest.xml index c5b9ffdfc7d9..076c3dfa688b 100644 --- a/support/android/apk/servoview/src/oculusvr/AndroidManifest.xml +++ b/support/android/apk/servoview/src/oculusvr/AndroidManifest.xml @@ -1,6 +1,6 @@ -> +>