diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-10-02 02:17:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 02:17:27 -0400 |
| commit | 37b978af686975eaf13689580868d9ea201ef04c (patch) | |
| tree | 5e4be1cdb049da236d4f3bc61aa7ea1ac51e299e /python/servo | |
| parent | 057acdca2d806508be77e0e84c2a627e8b48fa41 (diff) | |
| parent | 6d543dec28f41a9a91302f2a2488a0f08c49853d (diff) | |
| download | servo-37b978af686975eaf13689580868d9ea201ef04c.tar.gz servo-37b978af686975eaf13689580868d9ea201ef04c.zip | |
Auto merge of #21830 - paulrouget:com2org, r=SimonSapin
Android: com.mozilla to org.mozilla
We want to be compatible with the GeckoView namespace: https://maven.mozilla.org/maven2?prefix=maven2/org/mozilla/
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21830)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/devenv_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/post_build_commands.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index a357efa9a96..71181220b76 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -318,7 +318,7 @@ class MachCommands(CommandBase): 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 656e230c732..dc2731c0318 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -95,7 +95,7 @@ class PostBuildCommands(CommandBase): 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 @@ class PostBuildCommands(CommandBase): 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)] |