From 08df2364972b64802ec6045e8b864703e8807224 Mon Sep 17 00:00:00 2001
From: Chih-hung Hsieh <chh@google.com>
Date: Fri, 19 Aug 2016 17:58:32 +0000
Subject: Revert "Fix clang compiled memset recursive call problem."

This reverts commit d20e2a66b1d30c1a8d795826f5edb32a8f6f24f3.

Change-Id: I5110008a105c2531ff6cd3105b28a3800a5cebc2
---
 Android.build_one.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'Android.build_one.mk')

diff --git a/Android.build_one.mk b/Android.build_one.mk
index 16ea662bb..cb5de0748 100644
--- a/Android.build_one.mk
+++ b/Android.build_one.mk
@@ -23,15 +23,13 @@ LOCAL_MULTILIB := first
 vg_local_arch  := $(vg_arch)
 endif
 
-# For arm and arm64 targets, clang compiled module has other
-# undefined errors, see bug 28454823.
+# TODO: This workaround is to avoid calling memset from VG(memset)
+# wrapper because of invalid clang optimization; This seems to be
+# limited to amd64/x86 codegen(?);
 ifeq ($(filter $TARGET_ARCH,x86 x86_64),)
   LOCAL_CLANG := false
 endif
 
-# Do not call (builtin) memset from VG(memset).
-LOCAL_CLANG_CFLAGS += -fno-builtin-memset
-
 LOCAL_MODULE := $(vg_local_module)-$(vg_local_arch)-linux
 
 LOCAL_MODULE_TARGET_ARCH := $(vg_local_arch)
-- 
cgit v1.2.3