tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix multilib test data being installed twice to the same place"

Browse source
This commit is contained in:
Treehugger Robot 2018-01-27 03:42:09 +00:00 committed by Gerrit Code Review
commit f9d8f6fa7d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/base_rules.mk
View file

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