commit 30648c3a217274741eb319b48130785bcd77321d
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 20 22:48:10 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 20 22:48:10 2019 +0000
tree f8b7a47f45da75f0309b89e4031dac96c46d0c22
parent d9bef81f7c76d1a1dbf83a58d6e002988ac36dd8
parent 53cedb06535d32df7e7b8d1b8de059fcbcbd8332

Merge "Fix to avoid breaking aosp_x86 build"

core/fuzz_test.mk

diff --git a/core/fuzz_test.mk b/core/fuzz_test.mk
index 71801ba..4a0fcfa 100644
--- a/core/fuzz_test.mk
+++ b/core/fuzz_test.mk
@@ -67,12 +67,6 @@
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(my_fuzzer)/$(LOCAL_MODULE)
 LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(my_fuzzer)/$(LOCAL_MODULE)
 
-ifndef LOCAL_MULTILIB
-ifndef LOCAL_32_BIT_ONLY
-LOCAL_MULTILIB := 64
-endif
-endif
-
 ifndef LOCAL_STRIP_MODULE
 LOCAL_STRIP_MODULE := keep_symbols
 endif