commit 48630d72aea6bab5223eb2538c34d87c1500d7f6
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 29 07:41:07 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 29 07:41:07 2012 -0700
tree a11f05ddd0544e622d118b45706763a537df8acb
parent 3faf4c4879c9ec35d464774444b75a2e6b4224a6
parent 3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa

am 3043b188: Merge "Fix build for x86_64"

* commit '3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa':
  Fix build for x86_64

Android.mk

diff --git a/Android.mk b/Android.mk
index 89178df..84d24f7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -128,7 +128,7 @@
 
 LOCAL_SRC_FILES := $(libperf_src_files)
 
-LOCAL_CFLAGS := -DNO_NEWT_SUPPORT -DNO_LIBPERL -DNO_LIBPYTHON -DNO_STRLCPY -std=gnu99
+LOCAL_CFLAGS := -DNO_NEWT_SUPPORT -DNO_LIBPERL -DNO_LIBPYTHON -std=gnu99
 
 # temporary until bfd.h is added
 LOCAL_CFLAGS += -DNO_DEMANGLE
@@ -245,7 +245,7 @@
 LOCAL_SHARED_LIBRARIES := libdl
 
 # common
-LOCAL_CFLAGS := -DNO_NEWT_SUPPORT -DNO_LIBPERL -DNO_LIBPYTHON -DNO_STRLCPY -std=gnu99
+LOCAL_CFLAGS := -DNO_NEWT_SUPPORT -DNO_LIBPERL -DNO_LIBPYTHON -std=gnu99
 
 # in list.h: entry->next = LIST_POISON1;
 LOCAL_CFLAGS += -Wno-pointer-arith