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 
am: f9d8f6fa7d

Change-Id: I3c9ccd55a715a21bee97afc35f09329c2f6545b0
This commit is contained in:
Dan Willemsen
2018-01-27 03:49:49 +00:00
committed by android-build-merger
parent 67bf2d712a f9d8f6fa7d
commit 71bea86caa
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