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

Commit cb20ccaa authored by Sundong Ahn's avatar Sundong Ahn
Browse files

Remove dependency with configstore 1.2 

The configstore 1.2 is deleted. So cut the dependency with configstore
1.2.

Bug: 124531214
Test: build & boot
Test: adb shell lshal | grep configstore & check configstore 1.2
Change-Id: Ic6b1875e4cf62d45176b83f69a48382c4d9c05c8
parent 510ab6d1

libs/ui/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ cc_library_shared { 
        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@2.1",

        "android.hardware.graphics.mapper@3.0",

        "android.hardware.configstore@1.2",

        "android.hardware.configstore-utils",

        "libbase",

        "libcutils",

        "libhardware",
@@ -105,7 +103,6 @@ cc_library_shared { 
    ],



    export_shared_lib_headers: [

        "android.hardware.configstore@1.2",

        "android.hardware.graphics.common@1.2",

    ],

libs/ui/include/ui/ConfigStoreTypes.h

+11 −3
Original line number Diff line number Diff line
@@ -16,14 +16,22 @@ 


#pragma once



#include <android/hardware/configstore/1.2/types.h>



// android::ui::* in this header file will alias different types as

// the HIDL interface is updated.

namespace android {

namespace ui {



using android::hardware::configstore::V1_2::DisplayPrimaries;

struct CieXyz {

    float X;

    float Y;

    float Z;

};

struct DisplayPrimaries {

    CieXyz red;

    CieXyz green;

    CieXyz blue;

    CieXyz white;

};



}  // namespace ui

}  // namespace android

libs/ui/include_vndk/ui/ConfigStoreTypes.h

+11 −3
Original line number Diff line number Diff line
@@ -16,14 +16,22 @@ 


#pragma once



#include <android/hardware/configstore/1.2/types.h>



// android::ui::* in this header file will alias different types as

// the HIDL interface is updated.

namespace android {

namespace ui {



using android::hardware::configstore::V1_2::DisplayPrimaries;

struct CieXyz {

    float X;

    float Y;

    float Z;

};

struct DisplayPrimaries {

    CieXyz red;

    CieXyz green;

    CieXyz blue;

    CieXyz white;

};



}  // namespace ui

}  // namespace android

services/surfaceflinger/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ cc_defaults { 
        "android.hardware.configstore-utils",

        "android.hardware.configstore@1.0",

        "android.hardware.configstore@1.1",

        "android.hardware.configstore@1.2",

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.common@1.2",
@@ -188,7 +187,6 @@ cc_defaults { 
        "android.frameworks.displayservice@1.0",

        "android.hardware.configstore-utils",

        "android.hardware.configstore@1.0",

        "android.hardware.configstore@1.2",

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "libbinder",
@@ -243,13 +241,15 @@ cc_library_shared { 
        "android.hardware.configstore-utils",

        "android.hardware.configstore@1.0",

        "android.hardware.configstore@1.1",

        "android.hardware.configstore@1.2",

        "android.hardware.graphics.common@1.2",

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libui",

        "libutils",

    ],

    export_shared_lib_headers: [

        "android.hardware.graphics.common@1.2",

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

services/surfaceflinger/Scheduler/Scheduler.cpp

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <android/hardware/configstore/1.1/ISurfaceFlingerConfigs.h>

#include <android/hardware/configstore/1.2/ISurfaceFlingerConfigs.h>

#include <configstore/Utils.h>

#include <cutils/properties.h>

#include <ui/DisplayStatInfo.h>