From ecb3110adc6db7334ca4be6d5b3c130f38f5fa51 Mon Sep 17 00:00:00 2001 From: James Dong Date: Thu, 22 Mar 2012 19:36:39 -0700 Subject: Make file change because libvideoeditor source files moved o related-to-bug: 6214141 Change-Id: I3ef60ca7670df37d7e43546e244cfe6a33093ba9 --- libvideoeditor/lvpp/Android.mk | 20 ++++++++++---------- libvideoeditor/osal/src/Android.mk | 2 +- libvideoeditor/vss/3gpwriter/src/Android.mk | 6 +++--- libvideoeditor/vss/mcs/src/Android.mk | 8 ++++---- libvideoeditor/vss/src/Android.mk | 18 +++++++++--------- libvideoeditor/vss/stagefrightshells/src/Android.mk | 14 +++++++------- libvideoeditor/vss/video_filters/src/Android.mk | 4 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) (limited to 'libvideoeditor') diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 636beae..b4faa61 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -73,17 +73,17 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/base/media/libstagefright/rtsp \ $(JNI_H_INCLUDE) \ $(call include-path-for, corecg graphics) \ - $(TOP)/frameworks/native/include/media/openmax \ - $(TOP)/frameworks/media/libvideoeditor/osal/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/common/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/mcs/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/stagefrightshells/inc \ - $(TOP)/frameworks/media/libvideoeditor/lvpp \ - $(TOP)/frameworks/native/include/media/editor \ + $(TOP)/frameworks/av/libvideoeditor/osal/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/common/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/mcs/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ + $(TOP)/frameworks/av/libvideoeditor/lvpp \ $(TOP)/frameworks/base/media/jni/mediaeditor \ - $(TOP)/frameworks/native/services/audioflinger \ - $(TOP)/frameworks/base/services/audioflinger + $(TOP)/frameworks/base/services/audioflinger \ + $(TOP)/frameworks/native/include/media/editor \ + $(TOP)/frameworks/native/include/media/openmax \ + $(TOP)/frameworks/native/services/audioflinger LOCAL_SHARED_LIBRARIES += libdl diff --git a/libvideoeditor/osal/src/Android.mk b/libvideoeditor/osal/src/Android.mk index c70aecc..5415e96 100755 --- a/libvideoeditor/osal/src/Android.mk +++ b/libvideoeditor/osal/src/Android.mk @@ -44,7 +44,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libcutils libutils LOCAL_C_INCLUDES += \ - $(TOP)/frameworks/media/libvideoeditor/osal/inc \ + $(TOP)/frameworks/av/libvideoeditor/osal/inc \ LOCAL_SHARED_LIBRARIES += libdl diff --git a/libvideoeditor/vss/3gpwriter/src/Android.mk b/libvideoeditor/vss/3gpwriter/src/Android.mk index 4cd5e55..057c348 100755 --- a/libvideoeditor/vss/3gpwriter/src/Android.mk +++ b/libvideoeditor/vss/3gpwriter/src/Android.mk @@ -37,9 +37,9 @@ LOCAL_STATIC_LIBRARIES := \ libvideoeditor_osal LOCAL_C_INCLUDES += \ - $(TOP)/frameworks/media/libvideoeditor/osal/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/3gpwriter/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/common/inc + $(TOP)/frameworks/av/libvideoeditor/osal/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/3gpwriter/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/common/inc LOCAL_SHARED_LIBRARIES += libdl diff --git a/libvideoeditor/vss/mcs/src/Android.mk b/libvideoeditor/vss/mcs/src/Android.mk index 3d6cf20..37986b9 100755 --- a/libvideoeditor/vss/mcs/src/Android.mk +++ b/libvideoeditor/vss/mcs/src/Android.mk @@ -39,10 +39,10 @@ LOCAL_STATIC_LIBRARIES := \ libvideoeditor_osal LOCAL_C_INCLUDES += \ - $(TOP)/frameworks/media/libvideoeditor/osal/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/mcs/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/common/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/stagefrightshells/inc \ + $(TOP)/frameworks/av/libvideoeditor/osal/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/mcs/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/common/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ $(TOP)/frameworks/native/include/media/openmax LOCAL_SHARED_LIBRARIES += libdl diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk index 1beb162..df6925e 100755 --- a/libvideoeditor/vss/src/Android.mk +++ b/libvideoeditor/vss/src/Android.mk @@ -62,16 +62,16 @@ LOCAL_STATIC_LIBRARIES := \ libvideoeditor_stagefrightshells LOCAL_C_INCLUDES += \ - $(TOP)/system/media/audio_utils/include \ - $(TOP)/system/media/audio_effects/include \ - $(TOP)/frameworks/media/libvideoeditor/osal/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/mcs/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/common/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/stagefrightshells/inc \ - $(TOP)/frameworks/native/services/audioflinger \ + $(TOP)/frameworks/av/libvideoeditor/osal/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/mcs/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/common/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ $(TOP)/frameworks/base/services/audioflinger \ - $(TOP)/frameworks/native/include/media/openmax + $(TOP)/frameworks/native/include/media/openmax \ + $(TOP)/frameworks/native/services/audioflinger \ + $(TOP)/system/media/audio_effects/include \ + $(TOP)/system/media/audio_utils/include LOCAL_SHARED_LIBRARIES += libdl diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index 5b8e270..d3cff3f 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -36,15 +36,15 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/base/media/libstagefright/rtsp \ $(JNI_H_INCLUDE) \ $(call include-path-for, corecg graphics) \ - $(TOP)/frameworks/native/include/media/openmax \ + $(TOP)/frameworks/av/libvideoeditor/lvpp \ + $(TOP)/frameworks/av/libvideoeditor/osal/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/common/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/mcs/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ $(TOP)/frameworks/base/core/jni/mediaeditor \ - $(TOP)/frameworks/media/libvideoeditor/vss/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/common/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/mcs/inc \ - $(TOP)/frameworks/media/libvideoeditor/lvpp \ - $(TOP)/frameworks/media/libvideoeditor/osal/inc \ $(TOP)/frameworks/native/include/media/editor \ - $(TOP)/frameworks/media/libvideoeditor/vss/stagefrightshells/inc + $(TOP)/frameworks/native/include/media/openmax LOCAL_SHARED_LIBRARIES := \ libcutils \ diff --git a/libvideoeditor/vss/video_filters/src/Android.mk b/libvideoeditor/vss/video_filters/src/Android.mk index 589e172..cc2540c 100755 --- a/libvideoeditor/vss/video_filters/src/Android.mk +++ b/libvideoeditor/vss/video_filters/src/Android.mk @@ -42,8 +42,8 @@ LOCAL_STATIC_LIBRARIES := \ libvideoeditor_osal LOCAL_C_INCLUDES += \ - $(TOP)/frameworks/media/libvideoeditor/osal/inc \ - $(TOP)/frameworks/media/libvideoeditor/vss/common/inc + $(TOP)/frameworks/av/libvideoeditor/osal/inc \ + $(TOP)/frameworks/av/libvideoeditor/vss/common/inc LOCAL_SHARED_LIBRARIES += libdl -- cgit v1.1