commit 89521898b56f2ebc3fb68acfb6bc6dde9b6f5c38
author Brian Carlstrom <bdc@google.com> Wed Dec 07 22:05:07 2011 -0800
committer Brian Carlstrom <bdc@google.com> Wed Jan 04 00:23:07 2012 -0800
tree 6811878efd4490f78ae099ec7e14c1a1ffe4d868
parent c74a6971fb9a65dbee337d51e7981a37be208a00

Merge art-cache dex files into oat files

Change-Id: I5a327a4e0b678bd9dabb12de4e21ef05e3fefd0b

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 33a4fb0..3fe0477 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -61,6 +61,9 @@
   ART_TARGET_CFLAGS += -DANDROID_SMP=0
 endif
 
+# To use oprofile_android --callgraph, uncomment this and recompile with "mmm art -B -j16"
+# ART_TARGET_CFLAGS += -fno-omit-frame-pointer -marm -mapcs
+
 ART_HOST_NON_DEBUG_CFLAGS := $(art_non_debug_cflags)
 ART_TARGET_NON_DEBUG_CFLAGS := $(art_non_debug_cflags)
 

build/Android.executable.mk

diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index 616c1c2..52009ab 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -55,7 +55,7 @@
     LOCAL_MODULE := $$(art_executable)d
   endif
 
-  ifeq ($(art_target_or_host),target)
+  ifeq ($$(art_target_or_host),target)
     LOCAL_CFLAGS := $(ART_TARGET_CFLAGS)
     ifeq ($$(art_ndebug_or_debug),debug)
       LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS)