erlang: don't store ebin in build_environment

Summary: This is not necessary. We're not using the direct ebin directories anywhere. Thrird-party use-cases should use the whole app dir, rather than depending on this detail

Reviewed By: TheGeorge, TD5

Differential Revision: D74187188

fbshipit-source-id: 0e2b0488926842419f50d6f744059c24334c9493

Author: michalmuskala

prelude/erlang/erlang_application.bzl

@@ -458,7 +458,6 @@ def build_app_info(
         app_file = multidict_projection_key(build_environments, "app_files", name),
         priv_dir = multidict_projection_key(build_environments, "priv_dirs", name),
         include_dir = multidict_projection_key(build_environments, "include_dirs", name),
-        ebin_dir = multidict_projection_key(build_environments, "ebin_dirs", name),
         private_include_dir = multidict_projection(build_environments, "private_include_dir"),
         private_includes = multidict_projection(build_environments, "private_includes"),
         deps_files = multidict_projection(build_environments, "deps_files"),

prelude/erlang/erlang_build.bzl

@@ -46,7 +46,6 @@ BuildEnvironment = record(
     priv_dirs = field(PathArtifactMapping, {}),
     include_dirs = field(PathArtifactMapping, {}),
     private_include_dir = field(list[Artifact], []),
-    ebin_dirs = field(PathArtifactMapping, {}),
     deps_files = field(PathArtifactMapping, {}),
     app_files = field(PathArtifactMapping, {}),
     # convenience storrage
@@ -75,7 +74,6 @@ def _prepare_build_environment(
     """Prepare build environment and collect the context from all dependencies."""
     priv_dirs = {}
     include_dirs = {}
-    ebin_dirs = {}
     deps_files = {}
     includes = {}
     beams = {}
@@ -108,7 +106,6 @@ def _prepare_build_environment(
 
             # collect dirs
             priv_dirs[name] = dep_info.priv_dir[toolchain.name]
-            ebin_dirs[name] = dep_info.ebin_dir[toolchain.name]
 
             # collect app files
             app_files[name] = dep_info.app_file[toolchain.name]
@@ -145,7 +142,6 @@ def _prepare_build_environment(
         beams = beams,
         priv_dirs = priv_dirs,
         include_dirs = include_dirs,
-        ebin_dirs = ebin_dirs,
         deps_files = deps_files,
         app_files = app_files,
         input_mapping = input_mapping,
@@ -175,7 +171,6 @@ def _generate_input_mapping(build_environment: BuildEnvironment, input_artifacts
         priv_dirs = build_environment.priv_dirs,
         include_dirs = build_environment.include_dirs,
         private_include_dir = build_environment.private_include_dir,
-        ebin_dirs = build_environment.ebin_dirs,
         deps_files = build_environment.deps_files,
         app_files = build_environment.app_files,
         app_includes = build_environment.app_includes,
@@ -244,7 +239,6 @@ def _generate_include_artifacts(
         # copied fields
         beams = build_environment.beams,
         priv_dirs = build_environment.priv_dirs,
-        ebin_dirs = build_environment.ebin_dirs,
         app_beams = build_environment.app_beams,
         app_files = build_environment.app_files,
         input_mapping = build_environment.input_mapping,
@@ -261,20 +255,19 @@ def _generate_beam_artifacts(
         name: str,
         src_artifacts: list[Artifact]) -> BuildEnvironment:
     # anchor for ebin dir
-    anchor = _make_dir_anchor(ctx, paths.join(_build_dir(toolchain), name, "ebin"))
+    ebin = paths.join(_build_dir(toolchain), name, "ebin")
 
-    beam_mapping = {
-        module_name(src): ctx.actions.declare_output(beam_path(anchor, src))
-        for src in src_artifacts
-    }
+    beam_mapping = {}
+    for erl in src_artifacts:
+        module = module_name(erl)
+        beam_mapping[module] = ctx.actions.declare_output(ebin, module + ".beam")
 
     # dep files
     deps_files = _get_deps_files(ctx, toolchain, src_artifacts, build_environment.deps_files)
 
     updated_build_environment = BuildEnvironment(
         # updated fields
         beams = _merge(beam_mapping, build_environment.beams),
-        ebin_dirs = _add(build_environment.ebin_dirs, name, anchor.artifact),
         deps_files = deps_files,
         app_beams = beam_mapping,
         # copied fields
@@ -317,7 +310,6 @@ def _generate_chunk_artifacts(
         priv_dirs = build_environment.priv_dirs,
         include_dirs = build_environment.include_dirs,
         private_include_dir = build_environment.private_include_dir,
-        ebin_dirs = build_environment.ebin_dirs,
         deps_files = build_environment.deps_files,
         app_files = build_environment.app_files,
         app_includes = build_environment.app_includes,
@@ -813,7 +805,6 @@ def _peek_private_includes(
         beams = build_environment.beams,
         priv_dirs = build_environment.priv_dirs,
         include_dirs = build_environment.include_dirs,
-        ebin_dirs = build_environment.ebin_dirs,
         deps_files = build_environment.deps_files,
         app_files = build_environment.app_files,
         app_includes = build_environment.app_includes,

prelude/erlang/erlang_info.bzl

@@ -54,7 +54,6 @@ ErlangAppInfo = provider(
             # references to ankers for the relevant directories for the application
             "priv_dir",
             "private_include_dir",
-            "ebin_dir",
             # applications that are in path but not build by buck2 are virtual
             # the use-case for virtual apps are OTP applications that are shipeped
             # with the Erlang distribution

prelude/erlang/erlang_otp_application.bzl

@@ -79,7 +79,6 @@ def _erlang_otp_application_impl(ctx: AnalysisContext) -> list[Provider]:
             priv_dir = None,
             include_dir = None,
             private_include_dir = None,
-            ebin_dir = None,
             virtual = True,
             app_folder = None,
         ),

prelude/erlang/erlang_tests.bzl

@@ -155,7 +155,6 @@ def erlang_test_impl(ctx: AnalysisContext) -> list[Provider]:
         priv_dirs = pre_build_environment.priv_dirs,
         include_dirs = pre_build_environment.include_dirs,
         private_include_dir = pre_build_environment.private_include_dir,
-        ebin_dirs = pre_build_environment.ebin_dirs,
         deps_files = pre_build_environment.deps_files,
         app_files = pre_build_environment.app_files,
         # convenience storrage
@@ -192,7 +191,7 @@ def erlang_test_impl(ctx: AnalysisContext) -> list[Provider]:
         [suite],
     )
 
-    ebin_dir = paths.dirname(build_environment.ebin_dirs["tests"].short_path)
+    ebin_dir = paths.dirname(build_environment.beams[suite_name].short_path)
 
     suite_data = paths.join(ebin_dir, suite_name + "_data")
     data_dir = _build_resource_dir(ctx, ctx.attrs.resources, suite_data)