Avoid the .stamp dependency in build_generated_jni.mk am: 24543f2279 am: c56ad6e1f8 am: 55d378a8e9
am: 2a103c075c
Change-Id: I61f559b55a041dff9efa50c88033eb8cb7b06f7b
diff --git a/build_generated_jni.mk b/build_generated_jni.mk
index a91d7ad..d6e83a4 100644
--- a/build_generated_jni.mk
+++ b/build_generated_jni.mk
@@ -41,10 +41,7 @@
# Add the generated sources to the C includes.
LOCAL_C_INCLUDES += $(generated_sources_dir)
-# Create a stamp file after all files have been generated.
-gen := $(generated_sources_dir)/.jni.stamp
-$(gen) : $(generated_files)
- $(hide) echo $^ | sed -e 's/ /\n/g' > $@
-
-# Add the stamp file as a dependency to {import,export}_includes.
-$(local-intermediates-dir)/import_includes: | $(generated_sources_dir)/.jni.stamp
+# LOCAL_GENERATED_SOURCES will filter out anything that's not a C/C++ source
+# file, but still add the files as dependencies of the other files in the
+# module.
+LOCAL_GENERATED_SOURCES += $(generated_files)
