Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 076ace47 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

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

am: 71bea86c

Change-Id: Ie5a1f0de006fdc37d7c2abe6e2f083cbc2d1a905
parents 393453d7 71bea86c

core/base_rules.mk

+3 −3
Original line number Diff line number Diff line
@@ -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