Support jvm args, skip empty excludes

Support jvm args,skip empty excludes
commit_hash:a5a8235098e53dcc8b881857302c7adc70f15d9a

2 files changed, 16 insertions, 4 deletions

diff --git a/build/export_generators/ide-gradle/dependencies.jinja b/build/export_generators/ide-gradle/dependencies.jinja
index 3b912ecc10e..deb64a4ee7f 100644
--- a/build/export_generators/ide-gradle/dependencies.jinja
+++ b/build/export_generators/ide-gradle/dependencies.jinja
@@ -41,9 +41,11 @@
 {%-             if library.excludes.consumer|length -%} {
 {%-                 for exclude in library.excludes.consumer if exclude.classpath -%}
 {%-                     set classpath = exclude.classpath|replace('"','') -%}
-{%-                     set classpath_parts = split(classpath, ':') %}
+{%-                     set classpath_parts = split(classpath, ':') -%}
+{%-                     if (classpath_parts[0] != "") and (classpath_parts[1] != "") %}
         exclude(group = "{{ classpath_parts[0] }}", module = "{{ classpath_parts[1] }}")
-{%-                endfor %}
+{%-                     endif -%}
+{%-                 endfor %}
     }
 {%-             endif -%}
 {%-         endif -%}
diff --git a/build/export_generators/ide-gradle/javac_flags.jinja b/build/export_generators/ide-gradle/javac_flags.jinja
index f4a63f7db52..d8e40b3f6e4 100644
--- a/build/export_generators/ide-gradle/javac_flags.jinja
+++ b/build/export_generators/ide-gradle/javac_flags.jinja
@@ -1,15 +1,17 @@
 {%- set javac_flags = [] -%}
+{%- set jvm_flags = [] -%}
 {%- if target.javac.flags|length -%}
 {#-     skip errorprone options -#}
-{%-     set javac_flags = target.javac.flags|reject('startsWith', '-Xep') -%}
+{%-     set javac_flags = target.javac.flags|reject('startsWith', '-Xep')|reject('startsWith', '-J') -%}
 {%-     if javac_flags|length -%}
 {%-         if (javac_flags|length == 1) and (javac_flags|first == '-parameters') -%}
 {%-             set javac_flags = [] -%}
 {%-         endif -%}
 {%-     endif -%}
+{%-     set jvm_flags = target.javac.flags|select('startsWith', '-J') -%}
 {%- endif -%}
 
-{%- if javac_flags|length or has_errorprone %}
+{%- if javac_flags|length or jvm_flags|length or has_errorprone %}
 
 tasks.withType<JavaCompile> {
 {%-     if javac_flags|length -%}
@@ -18,6 +20,14 @@ tasks.withType<JavaCompile> {
 {%-         endfor -%}
 {%-     endif -%}
 
+{%-     if jvm_flags|length %}
+    options.isFork = true
+    options.forkOptions.jvmArgs = listOf(
+{%-         for jvm_flag in jvm_flags -%}
+"{{ jvm_flag|replace("-J", "") }}"{% if not loop.last %}, {% endif -%}
+{%-         endfor -%})
+{%      endif -%}
+
 {%-     if has_errorprone -%}
 {%-         set ep_checks = target.javac.flags|select('startsWith', '-Xep:') -%}
 {%-         set ep_checkopts = target.javac.flags|select('startsWith', '-XepOpt:') -%}