diff options
| author | Mathias Agopian <mathias@google.com> | 2012-02-24 18:25:41 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-02-24 18:26:01 -0800 |
| commit | 9eeafeb52fecf90882e9b44eeefcb7c3e16aa915 (patch) | |
| tree | 0a09b02937d7097e042367163fbe4c9d4b5b2230 | |
| parent | 5ce96d97feafc6989f6141bb2633eae3d87ddf28 (diff) | |
| download | frameworks_av-9eeafeb52fecf90882e9b44eeefcb7c3e16aa915.zip frameworks_av-9eeafeb52fecf90882e9b44eeefcb7c3e16aa915.tar.gz frameworks_av-9eeafeb52fecf90882e9b44eeefcb7c3e16aa915.tar.bz2 | |
remove dependency on android_native{s_priv|buffer}.h
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
5 files changed, 3 insertions, 21 deletions
diff --git a/include/media/stagefright/HardwareAPI.h b/include/media/stagefright/HardwareAPI.h index 32eed3f..17efd35 100644 --- a/include/media/stagefright/HardwareAPI.h +++ b/include/media/stagefright/HardwareAPI.h @@ -19,7 +19,7 @@ #define HARDWARE_API_H_ #include <media/stagefright/OMXPluginBase.h> -#include <ui/android_native_buffer.h> +#include <system/window.h> #include <utils/RefBase.h> #include <OMX_Component.h> diff --git a/include/private/ui/android_natives_priv.h b/include/private/ui/android_natives_priv.h deleted file mode 100644 index 6b9f524..0000000 --- a/include/private/ui/android_natives_priv.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <ui/android_native_buffer.h> diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp index e892f92..297f2c9 100644 --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp @@ -24,7 +24,7 @@ #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MetaData.h> #include <surfaceflinger/Surface.h> -#include <ui/android_native_buffer.h> +#include <system/window.h> #include <ui/GraphicBufferMapper.h> #include <gui/ISurfaceTexture.h> diff --git a/media/libstagefright/include/SoftwareRenderer.h b/media/libstagefright/include/SoftwareRenderer.h index 8f2ea95..7ab0042 100644 --- a/media/libstagefright/include/SoftwareRenderer.h +++ b/media/libstagefright/include/SoftwareRenderer.h @@ -20,7 +20,7 @@ #include <media/stagefright/ColorConverter.h> #include <utils/RefBase.h> -#include <ui/android_native_buffer.h> +#include <system/window.h> namespace android { diff --git a/services/camera/libcameraservice/CameraHardwareInterface.h b/services/camera/libcameraservice/CameraHardwareInterface.h index 2ac69f78..78e225f 100644 --- a/services/camera/libcameraservice/CameraHardwareInterface.h +++ b/services/camera/libcameraservice/CameraHardwareInterface.h @@ -22,7 +22,6 @@ #include <binder/MemoryHeapBase.h> #include <utils/RefBase.h> #include <surfaceflinger/ISurface.h> -#include <ui/android_native_buffer.h> #include <ui/GraphicBuffer.h> #include <camera/Camera.h> #include <camera/CameraParameters.h> |