am 8d61be6c: am f9b75b1b: Merge "Don\'t filter on a non-existent variable."

* commit '8d61be6c781277ae3f5423c805092220a961b102':
  Don't filter on a non-existent variable.
This commit is contained in:
Dan Albert
2015-08-17 20:24:05 +00:00
committed by Android Git Automerger

View File

@@ -207,8 +207,6 @@ endif
my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries)
my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries)
my_cflags := $(filter-out $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_UNSUPPORTED_CFLAGS),$(my_cflags))
include $(BUILD_SYSTEM)/cxx_stl_setup.mk
# Add static HAL libraries