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

Commit c283c5f3 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Match src paths with aidl package name 

In order for the build system to track updates to the header files
during incremental builds, always specify the src files using the same
path as the package for C++ compilations.

Bug: 112114177
Test: m
Change-Id: I5fb25124a26f190c462e2e60fc75a88d48643c10
Merged-In: I5fb25124a26f190c462e2e60fc75a88d48643c10
parent daba8f4f

camera/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ filegroup { 
        "aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl",

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

    ],

    path: "aidl",

}



// Extra AIDL files that are used by framework.jar but not libcamera_client
@@ -97,4 +98,5 @@ filegroup { 
        "aidl/android/hardware/ICamera.aidl",

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

    ],

    path: "aidl",

}

media/libaudioclient/Android.bp

+12 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ cc_library_shared { 
        // AIDL files for audioclient interfaces

        // 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",

        ":libaudioclient_aidl_private",

        ":libaudioclient_aidl",



        "AudioEffect.cpp",
@@ -79,4 +79,15 @@ filegroup { 
    srcs: [

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

    ],

    path: "aidl",

}



// Used to strip the "aidl/" from the path, so the build system can predict the

// output filename.

filegroup {

    name: "libaudioclient_aidl_private",

    srcs: [

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

    ],

    path: "aidl",

}

media/libmedia/Android.bp

+11 −2
Original line number Diff line number Diff line
@@ -35,6 +35,15 @@ cc_library { 
    clang: true,

}



filegroup {

    name: "libmedia_omx_aidl",

    srcs: [

        "aidl/android/IGraphicBufferSource.aidl",

        "aidl/android/IOMXBufferSource.aidl",

    ],

    path: "aidl",

}



cc_library_shared {

    name: "libmedia_omx",

    vendor_available: true,
@@ -44,8 +53,7 @@ cc_library_shared { 
    double_loadable: true,



    srcs: [

        "aidl/android/IGraphicBufferSource.aidl",

        "aidl/android/IOMXBufferSource.aidl",

        ":libmedia_omx_aidl",



        "IMediaCodecList.cpp",

        "IOMX.cpp",
@@ -147,6 +155,7 @@ filegroup { 
    srcs: [

        "aidl/android/media/IMediaExtractorUpdateService.aidl",

    ],

    path: "aidl",

}



cc_library {