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

Commit a3f8840d authored by Jiyong Park's avatar Jiyong Park Committed by Steven Moreland
Browse files

GraphicsEnv is separated from libui 

GraphicsEnv class is separated from libui in order to make libui VNDK.
The class is then built as a standalone library named
'libgraphicsenv.so'. Clients that were using the GraphicsEnv class are
also updated to reference the new library.

Bug: 38097618
Test: sailfish builds and boots

Change-Id: I4c35fdff0e92453b98ea21136ef0f99fab01b6f8
Merged-In: I4c35fdff0e92453b98ea21136ef0f99fab01b6f8
parent 7e7457f2

libs/graphicsenv/Android.bp

0 → 100644
+28 −0
Original line number Diff line number Diff line 
// Copyright (C) 2017 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.



cc_library_shared {

    name: "libgraphicsenv",



    srcs: [

        "GraphicsEnv.cpp",

    ],



    shared_libs: [

        "libnativeloader",

        "liblog",

    ],



    export_include_dirs: ["include"],

}

libs/ui/GraphicsEnv.cpp→libs/graphicsenv/GraphicsEnv.cpp

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


//#define LOG_NDEBUG 1

#define LOG_TAG "GraphicsEnv"

#include <ui/GraphicsEnv.h>

#include <graphicsenv/GraphicsEnv.h>



#include <mutex>

libs/ui/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ cc_library_shared { 
        "GraphicBuffer.cpp",

        "GraphicBufferAllocator.cpp",

        "GraphicBufferMapper.cpp",

        "GraphicsEnv.cpp",

        "HdrCapabilities.cpp",

        "PixelFormat.cpp",

        "Rect.cpp",
@@ -72,7 +71,6 @@ cc_library_shared { 
        "android.hardware.configstore@1.0",

	"android.hardware.configstore-utils",

        "libbase",

        "libnativeloader",

        "libcutils",

        "libhardware",

        "libhidlbase",
@@ -81,6 +79,7 @@ cc_library_shared { 
        "libsync",

        "libutils",

        "liblog",

        "libgraphicsenv",

    ],



    static_libs: [

opengl/libs/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ cc_defaults { 
    shared_libs: [

        // ***** DO NOT ADD NEW DEPENDENCIES HERE *****

        // In particular, DO NOT add libutils nor anything "above" libui

        "libui",

        "libgraphicsenv",

        "libnativewindow",

        "libbacktrace",

    ],