Copy from libs with proto_namespace 2 times: with and without namespace

Fix proto namespace in extract task
commit_hash:bdb0fc0dfef04a589b1a7610e2a82fb2b586d273

1 files changed, 7 insertions, 7 deletions

diff --git a/build/export_generators/ide-gradle/proto_prepare.jinja b/build/export_generators/ide-gradle/proto_prepare.jinja
index bc5ef839a45..dd99d920653 100644
--- a/build/export_generators/ide-gradle/proto_prepare.jinja
+++ b/build/export_generators/ide-gradle/proto_prepare.jinja
@@ -33,23 +33,23 @@ val prepareMainProtos = tasks.register<Copy>("prepareMainProtos") {
 {%- if extractLibrariesProtosTask %}
 
 val extractMainLibrariesProtos = tasks.register<Copy>("extractMainLibrariesProtos") {
-{%- set root_libraries = libraries|rejectattr('proto_namespace') -%}
-{%- set ns_libraries = libraries|selectattr('proto_namespace') -%}
-{%- if root_libraries|length %}
     from("$arcadia_root") {
-{%-     for library in root_libraries -%}
+{%-     for library in libraries -%}
 {%-         set path_and_jar = rsplit(library.jar, '/', 2) %}
         include("{{ path_and_jar[0] }}/**/*.proto")
 {%-     endfor %}
     }
-{%- endif -%}
+{%- set ns_libraries = libraries|selectattr('proto_namespace') -%}
 {%- if ns_libraries|length -%}
 {%-     for library in ns_libraries -%}
 {%-         set path_and_jar = rsplit(library.jar, '/', 2) -%}
 {%-         set path = "#R/" + path_and_jar[0] -%}
-{%-         set path = path|replace("#R/" + library.proto_namespace + "/", "")|replace("#R/", "") %}
+{%-         set path = path|replace("#R/" + library.proto_namespace + "/", "")|replace("#R/" + library.proto_namespace, "")|replace("#R/", "") -%}
+{%-         if path != "" -%}
+{%-             set path = path + "/" -%}
+{%-         endif %}
     from("$arcadia_root/{{ library.proto_namespace }}") {
-        include("{{ path }}/**/*.proto")
+        include("{{ path }}**/*.proto")
     }
 {%-     endfor -%}
 {%- endif %}