commit ce3d46fe0579a290804e58024dcd84430ccf0e8a
author Jingwen Chen <jingwen@google.com> Tue Aug 25 05:34:43 2020 +0000
committer Jingwen Chen <jingwen@google.com> Tue Aug 25 06:11:53 2020 +0000
tree 229d9fc6cd5bc55e3ab3164a7b53a267dfe5b0c8
parent 81a0b66d93ee81e32c5d80e6adb7a5139b8ee832

Bazel overlay: rename 'deps' to 'module_deps'.

'deps' is a module prop used by some module types, like
prebuilt_build_tool:

https://cs.android.com/android/platform/superproject/+/master:build/soong/android/prebuilt_build_tool.go;l=25-26;drc=751ae87ed29c67629f068a8590af80023a457294

Use `module_deps` to prevent conflicts in the generated overlay
attributes.

Bug: 162720644
Test: m bazel_overlay && cd out/soong/bazel_overlay && bazel cquery
//...
Test: soong_build tests

Signed-off-by: Jingwen Chen <jingwen@google.com>
Change-Id: Ia075a860983960b2d9121d30ead8f808be7e0c5b

cmd/soong_build/bazel_overlay.go

diff --git a/cmd/soong_build/bazel_overlay.go b/cmd/soong_build/bazel_overlay.go
index e1d3d41..308076d 100644
--- a/cmd/soong_build/bazel_overlay.go
+++ b/cmd/soong_build/bazel_overlay.go
@@ -39,7 +39,7 @@
     module_name = "%s",
     module_type = "%s",
     module_variant = "%s",
-    deps = %s,
+    module_deps = %s,
 %s)`
 
 	// The soong_module rule implementation in a .bzl file
@@ -74,7 +74,7 @@
     "module_name": attr.string(mandatory = True),
     "module_type": attr.string(mandatory = True),
     "module_variant": attr.string(),
-    "deps": attr.label_list(providers = [SoongModuleInfo]),
+    "module_deps": attr.label_list(providers = [SoongModuleInfo]),
 }
 
 
@@ -115,7 +115,7 @@
             module_type = module_type,
             module_name = kwargs.pop("module_name", ""),
             module_variant = kwargs.pop("module_variant", ""),
-            deps = kwargs.pop("deps", []),
+            module_deps = kwargs.pop("module_deps", []),
         )
     else:
         soong_module_rule(