R8: Up java heap size to 4G

Also include fix for my git cl upload issues.

Change-Id: I9384983ac3d8660c707b2d0184143279517758c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6258149
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1419309}
NOKEYCHECK=True
GitOrigin-RevId: e573dcd62b3388834f7a01de0c66a66a1835b67f

Author: Sam Maier

android/gyp/check_for_missing_direct_deps.py

@@ -19,7 +19,7 @@
 import action_helpers  # build_utils adds //build to sys.path.
 
 _SRC_PATH = pathlib.Path(build_utils.DIR_SOURCE_ROOT).resolve()
-sys.path.append(str(_SRC_PATH / 'build/gn_ast'))
+sys.path.insert(1, str(_SRC_PATH / 'build/gn_ast'))
 from gn_editor import NO_VALID_GN_STR
 
 

android/gyp/proguard.py

@@ -330,8 +330,8 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data):
                                                      tmp_output)
     base_context = split_contexts_by_name['base']
 
-    # R8 OOMs with xmx=2G.
-    cmd = build_utils.JavaCmd(xmx='3G') + [
+    # R8 OOMs with xmx=3G.
+    cmd = build_utils.JavaCmd(xmx='4G') + [
         # Allows -whyareyounotinlining, which we don't have by default, but
         # which is useful for one-off queries.
         '-Dcom.android.tools.r8.experimental.enablewhyareyounotinlining=1',