commit 3faf4c4879c9ec35d464774444b75a2e6b4224a6
author Jean-Baptiste Queru <jbq@google.com> Tue Aug 28 10:06:21 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 28 10:06:21 2012 -0700
tree f29e999516711c5a53e8b2f9f88f5f5580c033d1
parent 50220376d56efea3187c6ee3d47b2380c6ad66c6
parent b72d0474ab2a0d78b2fb61973920aba9d777094c

am b72d0474: Merge "Use gcc 4.6"

* commit 'b72d0474ab2a0d78b2fb61973920aba9d777094c':
  Use gcc 4.6

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