diff --git a/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/SDKProcessor.java b/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/SDKProcessor.java index f1ece6357c5a..6e2fbdd7f6ab 100644 --- a/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/SDKProcessor.java +++ b/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/SDKProcessor.java @@ -233,7 +233,7 @@ public class SDKProcessor { System.out.println("Processing platform bindings..."); - final String sdkJar = args[0]; + final File sdkJar = new File(args[0]); sMaxSdkVersion = Integer.parseInt(args[1]); final String outdir = args[2]; @@ -276,7 +276,7 @@ public class SDKProcessor { // Used to track the calls to the various class-specific initialisation functions. ClassLoader loader = null; try { - loader = URLClassLoader.newInstance(new URL[]{new URL("file://" + sdkJar)}, + loader = URLClassLoader.newInstance(new URL[]{sdkJar.toURI().toURL()}, SDKProcessor.class.getClassLoader()); } catch (Exception e) { throw new RuntimeException(e.toString()); diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle index 21cf56fb4d9f..d0a69b93967f 100644 --- a/mobile/android/geckoview/build.gradle +++ b/mobile/android/geckoview/build.gradle @@ -494,7 +494,7 @@ task("generateSDKBindings", type: JavaExec) { // From -Pgenerate_sdk_bindings_args=... on command line; missing in // `android-gradle-dependencies` toolchain task. if (project.hasProperty('generate_sdk_bindings_args')) { - args project.generate_sdk_bindings_args.split(':') + args project.generate_sdk_bindings_args.split(';') } } diff --git a/mobile/android/mach_commands.py b/mobile/android/mach_commands.py index 48805c4a4bc8..928d486ed68f 100755 --- a/mobile/android/mach_commands.py +++ b/mobile/android/mach_commands.py @@ -80,7 +80,7 @@ class MachCommands(MachCommandBase): return os.path.basename(input).rsplit('-classes.txt', 1)[0] bindings_inputs = list(itertools.chain(*((input, stem(input)) for input in inputs))) - bindings_args = '-Pgenerate_sdk_bindings_args={}'.format(':'.join(bindings_inputs)) + bindings_args = '-Pgenerate_sdk_bindings_args={}'.format(';'.join(bindings_inputs)) ret = self.gradle( self.substs['GRADLE_ANDROID_GENERATE_SDK_BINDINGS_TASKS'] + [bindings_args] + args,