erlang: skip storing private_includes_dir

Summary: This is not needed anymore

Reviewed By: TheGeorge

Differential Revision: D74241118

fbshipit-source-id: 77b56b9b9da7cf2dd80f843d41ea17b3d5ab77f6

Author: michalmuskala

prelude/erlang/erlang_application.bzl

@@ -439,7 +439,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),
-        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"),
         input_mapping = multidict_projection(build_environments, "input_mapping"),

prelude/erlang/erlang_build.bzl

@@ -45,7 +45,6 @@ BuildEnvironment = record(
     beams = field(ModuleArtifactMapping, {}),
     priv_dirs = field(PathArtifactMapping, {}),
     include_dirs = field(PathArtifactMapping, {}),
-    private_include_dir = field(list[Artifact], []),
     deps_files = field(PathArtifactMapping, {}),
     app_files = field(PathArtifactMapping, {}),
     # convenience storrage
@@ -164,7 +163,6 @@ def _generate_input_mapping(build_environment: BuildEnvironment, input_artifacts
         beams = build_environment.beams,
         priv_dirs = build_environment.priv_dirs,
         include_dirs = build_environment.include_dirs,
-        private_include_dir = build_environment.private_include_dir,
         deps_files = build_environment.deps_files,
         app_files = build_environment.app_files,
         app_includes = build_environment.app_includes,
@@ -211,22 +209,19 @@ def _generate_include_artifacts(
         includes = _merge(include_mapping, build_environment.includes)
         private_includes = build_environment.private_includes
         include_dirs = _add(build_environment.include_dirs, name, include_dir)
-        private_include_dir = build_environment.private_include_dir
         app_includes = include_mapping
     else:
         # fields for private include directory
         includes = build_environment.includes
         private_includes = _merge(include_mapping, build_environment.private_includes)
         include_dirs = build_environment.include_dirs
-        private_include_dir = [include_dir] + build_environment.private_include_dir
         app_includes = build_environment.app_includes
 
     return BuildEnvironment(
         # updated fields
         includes = includes,
         private_includes = private_includes,
         include_dirs = include_dirs,
-        private_include_dir = private_include_dir,
         deps_files = deps_files,
         app_includes = app_includes,
         # copied fields
@@ -268,7 +263,6 @@ def _generate_beam_artifacts(
         private_includes = build_environment.private_includes,
         priv_dirs = build_environment.priv_dirs,
         include_dirs = build_environment.include_dirs,
-        private_include_dir = build_environment.private_include_dir,
         app_includes = build_environment.app_includes,
         app_files = build_environment.app_files,
         input_mapping = build_environment.input_mapping,
@@ -685,17 +679,14 @@ def _peek_private_includes(
 
     # get mutable dict for private includes
     new_private_includes = dict(build_environment.private_includes)
-    new_private_include_dir = list(build_environment.private_include_dir)
 
     # get private deps from dependencies
     for dep in dependencies.values():
         if ErlangAppInfo in dep:
-            if dep[ErlangAppInfo].private_include_dir:
-                new_private_include_dir.extend(dep[ErlangAppInfo].private_include_dir[toolchain.name])
+            if not dep[ErlangAppInfo].virtual:
                 new_private_includes.update(dep[ErlangAppInfo].private_includes[toolchain.name])
     return BuildEnvironment(
         private_includes = new_private_includes,
-        private_include_dir = new_private_include_dir,
         # copied fields
         includes = build_environment.includes,
         beams = build_environment.beams,

prelude/erlang/erlang_info.bzl

@@ -53,7 +53,6 @@ ErlangAppInfo = provider(
             "resources",
             # references to ankers for the relevant directories for the application
             "priv_dir",
-            "private_include_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

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

prelude/erlang/erlang_tests.bzl

@@ -154,7 +154,6 @@ def erlang_test_impl(ctx: AnalysisContext) -> list[Provider]:
         beams = pre_build_environment.beams,
         priv_dirs = pre_build_environment.priv_dirs,
         include_dirs = pre_build_environment.include_dirs,
-        private_include_dir = pre_build_environment.private_include_dir,
         deps_files = pre_build_environment.deps_files,
         app_files = pre_build_environment.app_files,
         # convenience storrage