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

Commit d8931ac8 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix circular dependency libnativewindow <-> libui 

Bug: 37647680, 37648355
Test: compile, manual
Change-Id: I2fdec8e86f6729aadd572a250b9d55d77f0d4eef
parent 933eb187

camera/common/1.0/default/include/HandleImporter.h

+1 −1
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
#ifndef CAMERA_COMMON_1_0_HANDLEIMPORTED_H

#define CAMERA_COMMON_1_0_HANDLEIMPORTED_H



#include <system/window.h>

#include <utils/Mutex.h>

#include <android/hardware/graphics/mapper/2.0/IMapper.h>

#include <cutils/native_handle.h>



using android::hardware::graphics::mapper::V2_0::IMapper;

graphics/mapper/2.0/default/GrallocMapper.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define ANDROID_HARDWARE_GRAPHICS_MAPPER_V2_0_GRALLOC_MAPPER_H



#include <android/hardware/graphics/mapper/2.0/IMapper.h>

#include <system/window.h>

#include <cutils/native_handle.h>



#include <mutex>

#include <unordered_set>

renderscript/1.0/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ cc_test { 
        "libhidltransport",

        "libnativehelper",

        "libutils",

        "libnativewindow",

        "android.hardware.renderscript@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],