diff options
| author | James Dong <jdong@google.com> | 2012-03-28 11:03:25 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-03-28 11:03:25 -0700 |
| commit | ba4d0433319393d626d2169683209e4956a087e2 (patch) | |
| tree | 96912a08fd6fdc796c384a2a7a13b16e69c4bb2b /media/jni | |
| parent | d927a1d99630c05ff773f0e9e8791ca9a965e020 (diff) | |
| download | frameworks_base-ba4d0433319393d626d2169683209e4956a087e2.zip frameworks_base-ba4d0433319393d626d2169683209e4956a087e2.tar.gz frameworks_base-ba4d0433319393d626d2169683209e4956a087e2.tar.bz2 | |
frameworks base Android.mk file changes
Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/Android.mk | 12 | ||||
| -rw-r--r-- | media/jni/soundpool/Android.mk | 3 | ||||
| -rw-r--r-- | media/jni/soundpool/android_media_SoundPool.cpp | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 079a284..fcc3b13 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -42,12 +42,12 @@ LOCAL_C_INCLUDES += \ external/jhead \ external/tremor/Tremor \ frameworks/base/core/jni \ - frameworks/base/media/libmedia \ - frameworks/base/media/libstagefright \ - frameworks/base/media/libstagefright/codecs/amrnb/enc/src \ - frameworks/base/media/libstagefright/codecs/amrnb/common \ - frameworks/base/media/libstagefright/codecs/amrnb/common/include \ - frameworks/base/media/mtp \ + frameworks/av/media/libmedia \ + frameworks/av/media/libstagefright \ + frameworks/av/media/libstagefright/codecs/amrnb/enc/src \ + frameworks/av/media/libstagefright/codecs/amrnb/common \ + frameworks/av/media/libstagefright/codecs/amrnb/common/include \ + frameworks/av/media/mtp \ frameworks/native/include/media/openmax \ $(PV_INCLUDES) \ $(JNI_H_INCLUDE) \ diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk index 70dbfb3..160666b 100644 --- a/media/jni/soundpool/Android.mk +++ b/media/jni/soundpool/Android.mk @@ -4,9 +4,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ android_media_SoundPool.cpp -LOCAL_C_INCLUDES := \ - frameworks/base/media/libmedia - LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ diff --git a/media/jni/soundpool/android_media_SoundPool.cpp b/media/jni/soundpool/android_media_SoundPool.cpp index c6dee06..9658856 100644 --- a/media/jni/soundpool/android_media_SoundPool.cpp +++ b/media/jni/soundpool/android_media_SoundPool.cpp @@ -23,7 +23,7 @@ #include <nativehelper/jni.h> #include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> -#include <SoundPool.h> +#include <media/SoundPool.h> using namespace android; |