openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: 71bea86caa

Change-Id: Ie5a1f0de006fdc37d7c2abe6e2f083cbc2d1a905
This commit is contained in:
Dan Willemsen 2018-01-27 03:52:15 +00:00 committed by android-build-merger
parent 393453d761 71bea86caa
commit 076ace4727
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 # $(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