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

Commit 018549e4 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 5265466e af01feaf

core/jni/android_app_NativeActivity.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <android_runtime/android_app_NativeActivity.h>

#include <android_runtime/android_util_AssetManager.h>

#include <surfaceflinger/Surface.h>

#include <ui/egl/android_natives.h>

#include <system/window.h>

#include <androidfw/InputTransport.h>

#include <utils/Looper.h>

core/jni/com_google_android_gles_jni_EGLImpl.cpp

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <SkBitmap.h>

#include <SkPixelRef.h>



#include <ui/ANativeObjectBase.h>



#include <gui/SurfaceTexture.h>

#include <gui/SurfaceTextureClient.h>

include/gui/SurfaceTextureClient.h

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <gui/ISurfaceTexture.h>

#include <gui/SurfaceTexture.h>



#include <ui/egl/android_natives.h>

#include <ui/ANativeObjectBase.h>

#include <ui/Region.h>



#include <utils/RefBase.h>
@@ -31,7 +31,7 @@ namespace android { 
class Surface;



class SurfaceTextureClient

    : public EGLNativeBase<ANativeWindow, SurfaceTextureClient, RefBase>

    : public ANativeObjectBase<ANativeWindow, SurfaceTextureClient, RefBase>

{

public:

    SurfaceTextureClient(const sp<ISurfaceTexture>& surfaceTexture);

include/media/stagefright/HardwareAPI.h

+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>

include/private/ui/android_natives_priv.h

deleted100644 → 0
+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>