Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1843df5b authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "remove dependency on android_native{s_priv|buffer}.h"

parents 37d825e7 9eeafeb5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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>
+0 −17
Original line number Diff line number Diff line
/*
 * 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>
+1 −1
Original line number Diff line number Diff line
@@ -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>

+1 −1
Original line number Diff line number Diff line
@@ -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 {

+0 −1
Original line number Diff line number Diff line
@@ -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>