Wayland: Clean up dependencies on gen headers
In prior versions of Android, we needed to emit an explicit dependency
for a special export_includes file (otherwise generated internally to
the Android build system), so that the header files would be generated
before any code outside the library could incldue them.
This dependency was not correct for x86-64 code, as there were two
such export_include files, one under $OUT/obj/..., the other under
$OUT/obj_64/..., and only the first had the headers as a source
dependency.
With the N branch, the Android build system does now have a way to
correctly specify that the generated headers should be a dependency --
they can be added to LOCAL_GENERATED_SOURCES and now all files in that
list will be listed as a dependency, as well as any implementation files
in the same list also being compiled and included in the library.
This patch removes the lines which set up the additional dependencies on
the headers, as that really is an internal detail of the build system,
and now sets LOCAL_GENERATED_SOURCES to include headers as well as
implementation files.
Bug: 65008174
Test: Clean build x86-64
Test: Incremental build with generated files deleted first
Change-Id: Ieb12144401f186e5fedb02fb91c97c722a0d167c
diff --git a/Android.mk b/Android.mk
index 1fd94dc..d2d6d9f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -104,12 +104,6 @@
$(transform-generated-source)
# Note: The line above must be indented with tabs.
-# Ensure we generate the headers before they are used by any clients of the
-# library.
-# TODO(lpique): Introduce and upstream a LOCAL_EXPORT_C_GEN_INCLUDES setting
-# which adds this in build/core/binary.mk, to avoid relying on build internals.
-$(call local-intermediates-dir)/export_includes : $(GEN)
-
# --- Generate wayland-version.h from wayland-version.h.in
# This process does some simple text substitution based on values defined in configure.ac
# We must put the output where the users of the library can see it.
@@ -133,10 +127,4 @@
$(transform-generated-source)
# Note: The line above must be indented with tabs.
-# Ensure we generate the headers before they are used by any clients of the
-# library.
-# TODO(lpique): Introduce and upstream a LOCAL_EXPORT_C_GEN_INCLUDES setting
-# which adds this in build/core/binary.mk, to avoid relying on build internals.
-$(call local-intermediates-dir)/export_includes : $(GEN)
-
include $(BUILD_STATIC_LIBRARY)
