Commit 11ee3411 authored Jan 10, 2019 by Dan Willemsen

All all_objects to LOCAL_INTERMEDIATE_TARGETS

This fixes the WITH_TIDY flakes that we've been seeing, as we've been
relying on a particular order of target-specific variable inheritance.

Change-Id: I68c8a56620c29a41e45f26e5ea81a5313490c1cf
Fixes: 122637600
Test: WITH_TIDY=true m libhellojni_jni

parent e24da82f

core/binary.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -1308,6 +1308,8 @@ normal_objects += $(addprefix $(TOPDIR)$(LOCAL_PATH)/,$(LOCAL_PREBUILT_OBJ_FILES

		all_objects := $(normal_objects) $(gen_o_objects)

		LOCAL_INTERMEDIATE_TARGETS += $(all_objects)

		# Cleanup file tracking
		$(foreach f,$(my_tracked_gen_files),$(eval my_src_file_gen_$(s):=))
		my_tracked_gen_files :=