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

Commit 8cdb3bab authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Match src paths with aidl package name" into qt-dev-plus-aosp 

am: 3f18d11e

Change-Id: I6cdfb83e10760e236a4c191cd5c6609f8b7efd8d
parents 8e02ab49 3f18d11e

cmds/installd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ filegroup { 
    srcs: [

        "binder/android/os/IInstalld.aidl",

    ],

    path: "binder",

}



//

libs/binder/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ filegroup { 
    srcs: [

        "aidl/android/content/pm/IPackageManagerNative.aidl",

    ],

    path: "aidl",

}



subdirs = ["tests"]

libs/sensorprivacy/Android.bp

+10 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ cc_library_shared { 
    ],



    srcs: [

        "aidl/android/hardware/ISensorPrivacyListener.aidl",

        "aidl/android/hardware/ISensorPrivacyManager.aidl",

        ":libsensorprivacy_aidl",

        "SensorPrivacyManager.cpp",

    ],
@@ -45,3 +44,12 @@ cc_library_shared { 


    export_shared_lib_headers: ["libbinder"],

}



filegroup {

    name: "libsensorprivacy_aidl",

    srcs: [

        "aidl/android/hardware/ISensorPrivacyListener.aidl",

        "aidl/android/hardware/ISensorPrivacyManager.aidl",

    ],

    path: "aidl",

}

services/vr/hardware_composer/Android.bp

+140 −168
Original line number Diff line number Diff line
@@ -64,34 +64,6 @@ cc_library_shared { 


}



cc_library_static {

  name: "libvr_hwc-binder",

  srcs: [

    "aidl/android/dvr/IVrComposer.aidl",

    "aidl/android/dvr/IVrComposerCallback.aidl",

    "aidl/android/dvr/parcelable_composer_frame.cpp",

    "aidl/android/dvr/parcelable_composer_layer.cpp",

    "aidl/android/dvr/parcelable_unique_fd.cpp",

  ],

  aidl: {

    include_dirs: ["frameworks/native/services/vr/hardware_composer/aidl"],

    export_aidl_headers: true,

  },

  export_include_dirs: ["aidl"],



  cflags: [

    "-Wall",

    "-Werror",

  ],



  shared_libs: [

    "libbinder",

    "libui",

    "libutils",

    "libvr_hwc-hal",

  ],

}



cc_library_static {

    name: "libvr_hwc-impl",

    srcs: [
@@ -122,7 +94,7 @@ cc_binary { 
    name: "vr_hwc",

    vintf_fragments: ["manifest_vr_hwc.xml"],

    srcs: [

    "vr_hardware_composer_service.cpp"

        "vr_hardware_composer_service.cpp",

    ],

    static_libs: [

        "libvr_hwc-impl",

services/vr/hardware_composer/aidl/Android.bp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
cc_library_static {

    name: "libvr_hwc-binder",

    srcs: [

        "android/dvr/IVrComposer.aidl",

        "android/dvr/IVrComposerCallback.aidl",

        "android/dvr/parcelable_composer_frame.cpp",

        "android/dvr/parcelable_composer_layer.cpp",

        "android/dvr/parcelable_unique_fd.cpp",

    ],

    aidl: {

        local_include_dirs: ["."],

        export_aidl_headers: true,

    },

    export_include_dirs: ["."],



    cflags: [

        "-Wall",

        "-Werror",

    ],



    shared_libs: [

        "libbinder",

        "libui",

        "libutils",

        "libvr_hwc-hal",

    ],

}