Allow setting GST_DEBUG on Android through mach

3 files changed, 7 insertions, 2 deletions

diff --git a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
index dd52ac7ed64..d044b39423e 100644
--- a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
+++ b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
@@ -76,7 +76,8 @@ public class MainActivity extends Activity implements Servo.Client {
         Intent intent = getIntent();
         String args = intent.getStringExtra("servoargs");
         String log = intent.getStringExtra("servolog");
-        mServoView.setServoArgs(args, log);
+        String gstdebug = intent.getStringExtra("gstdebug");
+        mServoView.setServoArgs(args, log, gstdebug);
 
         if (Intent.ACTION_VIEW.equals(intent.getAction())) {
           mServoView.loadUri(intent.getData());
diff --git a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
index b5c18e3e5fa..28d5b07b70b 100644
--- a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
+++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
@@ -74,6 +74,7 @@ public class JNIServo {
       public boolean enableSubpixelTextAntialiasing = true;
       public long VRExternalContext = 0;
       public String logStr;
+      public String gstDebugStr;
       public boolean enableLogs = false;
     }
 
diff --git a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
index 8d9c0b21383..33431afa19a 100644
--- a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
+++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
@@ -45,6 +45,7 @@ public class ServoView extends GLSurfaceView
     private boolean mAnimating;
     private String mServoArgs;
     private String mServoLog;
+    private String mGstDebug;
     private GestureDetector mGestureDetector;
     private ScaleGestureDetector mScaleGestureDetector;
 
@@ -90,9 +91,10 @@ public class ServoView extends GLSurfaceView
         initGestures(context);
     }
 
-    public void setServoArgs(String args, String log) {
+    public void setServoArgs(String args, String log, String gstdebug) {
         mServoArgs = args;
         mServoLog = log;
+        mGstDebug = gstdebug;
     }
 
     public void reload() {
@@ -176,6 +178,7 @@ public class ServoView extends GLSurfaceView
             String uri = mInitialUri == null ? null : mInitialUri.toString();
             options.url = uri;
             options.logStr = mServoLog;
+            options.gstDebugStr = mGstDebug;
             mServo = new Servo(options, this, this, mClient, mActivity);
         });
     }