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 | |
| 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
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | drm/jni/Android.mk | 6 | ||||
| -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 | ||||
| -rw-r--r-- | voip/jni/rtp/Android.mk | 12 |
6 files changed, 17 insertions, 19 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index da1ac7b..ec0fe00 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -165,6 +165,7 @@ LOCAL_C_INCLUDES += \ $(call include-path-for, bluedroid) \ $(call include-path-for, libhardware)/hardware \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ + $(TOP)/frameworks/av/include \ external/skia/include/core \ external/skia/include/effects \ external/skia/include/images \ diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk index 4a55fc0..f8ecc8c 100644 --- a/drm/jni/Android.mk +++ b/drm/jni/Android.mk @@ -33,9 +33,9 @@ LOCAL_STATIC_LIBRARIES := LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ - $(TOP)/frameworks/base/drm/libdrmframework/include \ - $(TOP)/frameworks/base/drm/libdrmframework/plugins/common/include \ - $(TOP)/frameworks/base/include + $(TOP)/frameworks/av/drm/libdrmframework/include \ + $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include \ + $(TOP)/frameworks/av/include 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; diff --git a/voip/jni/rtp/Android.mk b/voip/jni/rtp/Android.mk index d725713..82d7912 100644 --- a/voip/jni/rtp/Android.mk +++ b/voip/jni/rtp/Android.mk @@ -45,12 +45,12 @@ LOCAL_STATIC_LIBRARIES := libgsm libstagefright_amrnbdec libstagefright_amrnbenc LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ external/libgsm/inc \ - frameworks/base/media/libstagefright/codecs/amrnb/common/include \ - frameworks/base/media/libstagefright/codecs/amrnb/common/ \ - frameworks/base/media/libstagefright/codecs/amrnb/enc/include \ - frameworks/base/media/libstagefright/codecs/amrnb/enc/src \ - frameworks/base/media/libstagefright/codecs/amrnb/dec/include \ - frameworks/base/media/libstagefright/codecs/amrnb/dec/src \ + frameworks/av/media/libstagefright/codecs/amrnb/common/include \ + frameworks/av/media/libstagefright/codecs/amrnb/common/ \ + frameworks/av/media/libstagefright/codecs/amrnb/enc/include \ + frameworks/av/media/libstagefright/codecs/amrnb/enc/src \ + frameworks/av/media/libstagefright/codecs/amrnb/dec/include \ + frameworks/av/media/libstagefright/codecs/amrnb/dec/src \ $(call include-path-for, audio-effects) LOCAL_CFLAGS += -fvisibility=hidden |