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

Commit 6bf135b0 authored by Colin Cross's avatar Colin Cross
Browse files

Export AIDL files as a filegroup for framework.jar 

Put AIDL files into a filegroup so they can be imported as sources
for framework.jar.

Bug: 69917341
Test: m checkbuild
Change-Id: Ia500ff881bcc8d4a6f0aa66e12d9e6bb5a07ecc1
parent b6549b62

camera/Android.bp

+23 −6
Original line number Diff line number Diff line
@@ -29,12 +29,7 @@ cc_library_shared { 
        // AIDL files for camera interfaces

        // The headers for these interfaces will be available to any modules that

        // include libcamera_client, at the path "aidl/package/path/BnFoo.h"

        "aidl/android/hardware/ICameraService.aidl",

        "aidl/android/hardware/ICameraServiceListener.aidl",

        "aidl/android/hardware/ICameraServiceProxy.aidl",

        "aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl",

        "aidl/android/hardware/camera2/ICameraDeviceUser.aidl",



        ":libcamera_client_aidl",



        // Source for camera interface parcelables, and manually-written interfaces

        "Camera.cpp",
@@ -81,3 +76,25 @@ cc_library_shared { 
    ],



}



// AIDL interface between camera clients and the camera service.

filegroup {

    name: "libcamera_client_aidl",

    srcs: [

        "aidl/android/hardware/ICameraService.aidl",

        "aidl/android/hardware/ICameraServiceListener.aidl",

        "aidl/android/hardware/ICameraServiceProxy.aidl",

        "aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl",

        "aidl/android/hardware/camera2/ICameraDeviceUser.aidl",

    ],

}



// Extra AIDL files that are used by framework.jar but not libcamera_client

// because they have hand-written native implementations.

filegroup {

    name: "libcamera_client_framework_aidl",

    srcs: [

        "aidl/android/hardware/ICamera.aidl",

        "aidl/android/hardware/ICameraClient.aidl",

    ],

}

media/libaudioclient/Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ cc_library_shared { 
        // The headers for these interfaces will be available to any modules that

        // include libaudioclient, at the path "aidl/package/path/BnFoo.h"

        "aidl/android/media/IAudioRecord.aidl",

        "aidl/android/media/IPlayer.aidl",

        ":libaudioclient_aidl",



        "AudioEffect.cpp",

        "AudioPolicy.cpp",
@@ -70,3 +70,11 @@ cc_library_shared { 
        ],

    },

}



// AIDL interface between libaudioclient and framework.jar

filegroup {

    name: "libaudioclient_aidl",

    srcs: [

        "aidl/android/media/IPlayer.aidl",

    ],

}