aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen2019-01-10 15:21:07 -0600
committerDan Willemsen2019-01-10 15:21:07 -0600
commit11ee341199783fa0cef3926b7f67583eaa6e55a4 (patch)
tree470225f7e5b066c6986006b161fb9d0e56c4b092
parente24da82ffd6f1dfcb2452022b28e21c9b34ddeaa (diff)
downloadplatform-build-11ee341199783fa0cef3926b7f67583eaa6e55a4.tar.gz
platform-build-11ee341199783fa0cef3926b7f67583eaa6e55a4.tar.xz
platform-build-11ee341199783fa0cef3926b7f67583eaa6e55a4.zip
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
-rw-r--r--core/binary.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/binary.mk b/core/binary.mk
index cbf2f01d4..be10c2d37 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1308,6 +1308,8 @@ normal_objects += $(addprefix $(TOPDIR)$(LOCAL_PATH)/,$(LOCAL_PREBUILT_OBJ_FILES
1308 1308
1309all_objects := $(normal_objects) $(gen_o_objects) 1309all_objects := $(normal_objects) $(gen_o_objects)
1310 1310
1311LOCAL_INTERMEDIATE_TARGETS += $(all_objects)
1312
1311# Cleanup file tracking 1313# Cleanup file tracking
1312$(foreach f,$(my_tracked_gen_files),$(eval my_src_file_gen_$(s):=)) 1314$(foreach f,$(my_tracked_gen_files),$(eval my_src_file_gen_$(s):=))
1313my_tracked_gen_files := 1315my_tracked_gen_files :=