diff --git a/core/base_rules.mk b/core/base_rules.mk
index b4d88889d..3ff3bd3f2 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -590,9 +590,6 @@ $(foreach extra_config, $(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config), \
 endif
 endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files
 
-arch_dir :=
-is_native :=
-
 ifneq ($(my_test_data_file_pairs),)
 $(foreach pair, $(my_test_data_file_pairs), \
   $(eval parts := $(subst :,$(space),$(pair))) \
@@ -603,6 +600,9 @@ $(foreach pair, $(my_test_data_file_pairs), \
       $(src_path):$(call append-path,$(dir),$(file))))))
 endif
 
+arch_dir :=
+is_native :=
+
 $(call create-suite-dependencies)
 
 endif  # LOCAL_COMPATIBILITY_SUITE