diff options
| author | Andreas Huber <andih@google.com> | 2010-01-27 13:31:36 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-27 13:31:36 -0800 |
| commit | 9ecaf8b8da6a556be6143b74b9e77cf4e08ff1e8 (patch) | |
| tree | 3aee45532c1de13c74ac9e8a1dd2a5752d3635e8 /media | |
| parent | 65bed2c6c24397852d0388807c2dd33626173670 (diff) | |
| parent | 55e99c61005b6c9b463f8069a71a7d8540fb8895 (diff) | |
| download | frameworks_base-9ecaf8b8da6a556be6143b74b9e77cf4e08ff1e8.zip frameworks_base-9ecaf8b8da6a556be6143b74b9e77cf4e08ff1e8.tar.gz frameworks_base-9ecaf8b8da6a556be6143b74b9e77cf4e08ff1e8.tar.bz2 | |
Merge "Attempt to fix the build ... again."
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 5e0fea1..1d82e32 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -1,6 +1,10 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +ifneq ($(BUILD_WITHOUT_PV),true) +include external/opencore/Config.mk +endif + LOCAL_SRC_FILES:= \ android_media_MediaPlayer.cpp \ android_media_MediaRecorder.cpp \ @@ -19,7 +23,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils ifneq ($(BUILD_WITHOUT_PV),true) -include external/opencore/Config.mk LOCAL_SRC_FILES += \ android_media_AmrInputStream.cpp |