diff options
| author | Andy McFadden <fadden@android.com> | 2010-05-21 12:22:30 -0700 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2010-05-21 12:22:30 -0700 |
| commit | e8c725b8cd415f2896616a09ad7a4787f02ad961 (patch) | |
| tree | a296613e281e687f61de27e34e1851c205f9e7d8 /dexopt | |
| parent | 2b2468eef943f0be75d73862e433d0eb9beeff93 (diff) | |
| parent | fc0dcfa2ea4325b1e2a5fc938b57f1b2a50d5f67 (diff) | |
| download | android_dalvik-e8c725b8cd415f2896616a09ad7a4787f02ad961.tar.gz android_dalvik-e8c725b8cd415f2896616a09ad7a4787f02ad961.tar.bz2 android_dalvik-e8c725b8cd415f2896616a09ad7a4787f02ad961.zip | |
resolved conflicts for merge of fc0dcfa2 to dalvik-dev
Change-Id: I54a5b9996252a22e8dd0214f4a4ccc8914f876ea
Diffstat (limited to 'dexopt')
| -rw-r--r-- | dexopt/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dexopt/Android.mk b/dexopt/Android.mk index 86370736f..eb486c8cd 100644 --- a/dexopt/Android.mk +++ b/dexopt/Android.mk @@ -35,6 +35,12 @@ LOCAL_SHARED_LIBRARIES := \ libssl \ libdvm +ifeq ($(TARGET_CPU_SMP),true) + LOCAL_CFLAGS += -DANDROID_SMP=1 +else + LOCAL_CFLAGS += -DANDROID_SMP=0 +endif + LOCAL_MODULE := dexopt include $(BUILD_EXECUTABLE) |