diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 86f0ab7..571cee9 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -1941,15 +1941,15 @@
 genrule {
     name: "cronet_aml_components_cronet_android_cronet_jni_registration",
     cmd: "$(location base/android/jni_generator/jni_registration_generator.py) --srcjar-path " +
-         "gen/components/cronet/android/cronet_jni_registration.srcjar " +
+         "$(genDir)/components/cronet/android/cronet_jni_registration.srcjar " +
          "--depfile " +
-         "gen/components/cronet/android/cronet_jni_registration.d " +
+         "$(genDir)/components/cronet/android/cronet_jni_registration.d " +
          "--sources-files " +
          "@FileArg(gen/components/cronet/android/cronet_impl_native_base_java.build_config.json:deps_info:jni:all_source) " +
          "--include_test_only " +
          "--use_proxy_hash " +
          "--header-path " +
-         "gen/components/cronet/android/cronet_jni_registration.h " +
+         "$(genDir)/components/cronet/android/cronet_jni_registration.h " +
          "--manual_jni_registration " +
          "--sources-exclusions " +
          "[\"../../base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java\", \"../../base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java\", \"../../base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java\", \"../../base/android/java/src/org/chromium/base/SysUtils.java\"]",
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index bbd3cda..9aa2f2a 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -812,6 +812,10 @@
     # TODO: find a better way to do this.
     target.deps.clear()
 
+    for i, val in enumerate(target.args):
+      if val in ['--depfile', '--srcjar-path', '--header-path']:
+        target.args[i + 1] = re.sub('^gen', '$(genDir)', target.args[i + 1])
+
   elif target.script == '//build/android/gyp/write_build_config.py':
     for i, val in enumerate(target.args):
       if val == '--depfile':