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

Commit cbbf3303 authored by Vinh Tran's avatar Vinh Tran
Browse files

Migrate aidl filegroup to aidl_library 

ag/22717101 uses aidl.deps prop in filegroup to include aidl headers. aosp/2571770 introduced aidl_library module type to better enforce explicit aidl headers in Android.bp.

This CL moves the libgui_aidl modified in ag/22717101 to aidl_library so we can deprecate the aidl.deps prop in filegroup.

Bug: 279960133
Test: m libgui
Change-Id: I17b448607d27ede681ffc42dc35077109463b9d7
parent af2f284a

libs/gui/Android.bp

+17 −11
Original line number Diff line number Diff line
@@ -129,13 +129,24 @@ cc_library_static { 
    },

}



filegroup {

aidl_library {

    name: "libgui_aidl_hdrs",

    hdrs: [

        "android/gui/DisplayInfo.aidl",

        "android/gui/FocusRequest.aidl",

        "android/gui/InputApplicationInfo.aidl",

        "android/gui/IWindowInfosListener.aidl",

        "android/gui/IWindowInfosReportedListener.aidl",

        "android/gui/WindowInfo.aidl",

        "android/gui/WindowInfosUpdate.aidl",

    ],

}



aidl_library {

    name: "libgui_aidl",

    srcs: ["aidl/**/*.aidl"],

    path: "aidl/",

    aidl: {

        deps: [":android_gui_aidl"],

    },

    strip_import_prefix: "aidl",

    deps: ["libgui_aidl_hdrs"],

}



filegroup {
@@ -147,9 +158,6 @@ filegroup { 
cc_library_static {

    name: "libgui_aidl_static",

    vendor_available: true,

    srcs: [

        ":libgui_aidl",

    ],



    shared_libs: [

        "libbinder",
@@ -175,9 +183,7 @@ cc_library_static { 


    aidl: {

        export_aidl_headers: true,

        include_dirs: [

            "frameworks/native/libs/gui",

        ],

        libs: ["libgui_aidl"],

    },

}