StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
parent 9f1e629503 4133793ce3
commit f9d8f6fa7d
1 changed files with 3 additions and 3 deletions
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 # $(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