summaryrefslogtreecommitdiffstats
path: root/dexopt
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2010-02-11 22:36:02 -0800
committerCarl Shapiro <cshapiro@google.com>2010-02-11 22:36:02 -0800
commit8eab1c515ef7f6bdb0252d49e6ea1c8ca7d8cfed (patch)
tree5fc5cd77839d2077733e567958e76192fea140b4 /dexopt
parent878e91ad5017950cbba1653c17470c87c6eb631b (diff)
downloadandroid_dalvik-8eab1c515ef7f6bdb0252d49e6ea1c8ca7d8cfed.tar.gz
android_dalvik-8eab1c515ef7f6bdb0252d49e6ea1c8ca7d8cfed.tar.bz2
android_dalvik-8eab1c515ef7f6bdb0252d49e6ea1c8ca7d8cfed.zip
Do not include assert.h in places where it may shadow the definition
provided by Common.h if WITH_DALVIK_ASSERTS is defined. The include from HeapBitmap.h was notable as it redefined the Dalvik friendly assert macro with the useless libc macro across all of the GC sources.
Diffstat (limited to 'dexopt')
-rw-r--r--dexopt/OptMain.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/dexopt/OptMain.c b/dexopt/OptMain.c
index 953db0b00..1e47009b6 100644
--- a/dexopt/OptMain.c
+++ b/dexopt/OptMain.c
@@ -41,7 +41,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <assert.h>
static const char* kClassesDex = "classes.dex";