diff options
| author | Mathias Agopian <mathias@google.com> | 2009-06-19 17:41:14 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-06-19 17:41:14 -0700 |
| commit | f73bbd042367b65780316d2335784686dedd0459 (patch) | |
| tree | 913a9ea96c37d617789914ec83f81ed0611d4d68 /core/jni/Android.mk | |
| parent | 6edf5af578c1ab1fcd44b7c08ca371456e4b7430 (diff) | |
| parent | aba6af9277b34c739b83d3d2d908724c3f7ec1b4 (diff) | |
| download | frameworks_base-f73bbd042367b65780316d2335784686dedd0459.zip frameworks_base-f73bbd042367b65780316d2335784686dedd0459.tar.gz frameworks_base-f73bbd042367b65780316d2335784686dedd0459.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 9066233..251bc84 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -11,6 +11,10 @@ else LOCAL_CFLAGS += -DPACKED="" endif +ifeq ($(WITH_JIT),true) + LOCAL_CFLAGS += -DWITH_JIT +endif + ifneq ($(USE_CUSTOM_RUNTIME_HEAP_MAX),) LOCAL_CFLAGS += -DCUSTOM_RUNTIME_HEAP_MAX=$(USE_CUSTOM_RUNTIME_HEAP_MAX) endif @@ -119,7 +123,8 @@ LOCAL_SRC_FILES:= \ com_android_internal_graphics_NativeUtils.cpp \ android_backup_BackupDataInput.cpp \ android_backup_BackupDataOutput.cpp \ - android_backup_FileBackupHelper.cpp + android_backup_FileBackupHelper.cpp \ + android_backup_RestoreHelperBase.cpp LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ |