Merge "Support native test prebuilts for X86+ARM builds"

2017-01-20 00:59:41 +00:00
parent f8acdc50fa d79dde610e
commit bf28f5933a
1 changed files with 1 additions and 1 deletions
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -15,7 +15,7 @@ else

  ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
    # Only support prebuilt shared and static libraries for translated arch
-    ifeq ($(filter SHARED_LIBRARIES STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),)
+    ifeq ($(filter SHARED_LIBRARIES STATIC_LIBRARIES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
      LOCAL_MULTILIB := first
    endif
  endif