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

Commit 9cce325f authored by Mathias Agopian's avatar Mathias Agopian
Browse files

split libsurfaceflinger_client and libcamera_client out of libui

parent 4fae0fd0

camera/libcameraservice/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -48,7 +48,9 @@ LOCAL_SHARED_LIBRARIES:= \ 
    libutils \

    libbinder \

    libcutils \

    libmedia

    libmedia \

    libcamera_client \

    libsurfaceflinger_client



LOCAL_MODULE:= libcameraservice

camera/libcameraservice/CameraHardwareStub.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "FakeCamera.h"

#include <utils/threads.h>

#include <ui/CameraHardwareInterface.h>

#include <camera/CameraHardwareInterface.h>

#include <binder/MemoryBase.h>

#include <binder/MemoryHeapBase.h>

#include <utils/threads.h>

camera/libcameraservice/CameraService.cpp

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ 
#include <utils/Errors.h>

#include <binder/MemoryBase.h>

#include <binder/MemoryHeapBase.h>

#include <ui/ICameraService.h>

#include <camera/ICameraService.h>

#include <surfaceflinger/ISurface.h>

#include <ui/Overlay.h>



#include <media/mediaplayer.h>

#include <media/AudioSystem.h>

camera/libcameraservice/CameraService.h

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#ifndef ANDROID_SERVERS_CAMERA_CAMERASERVICE_H

#define ANDROID_SERVERS_CAMERA_CAMERASERVICE_H



#include <ui/ICameraService.h>

#include <ui/CameraHardwareInterface.h>

#include <ui/Camera.h>

#include <camera/ICameraService.h>

#include <camera/CameraHardwareInterface.h>

#include <camera/Camera.h>



namespace android {

camera/tests/CameraServiceTest/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ LOCAL_SHARED_LIBRARIES += \ 
		libbinder \

                libcutils \

                libutils \

                libui

                libui \

                libcamera_client \

                libsurfaceflinger_client



include $(BUILD_EXECUTABLE)