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

Commit 1d2003a5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-436757... 

release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-4367572 snap-temp-L13500000107248413

Change-Id: I6a60272e97d7a4da3ffd965001cbfcabd7870451
parents c83c5e6d 21e87ff1

camera/device/3.3/Android.bp

+85 −0
Original line number Diff line number Diff line
@@ -70,3 +70,88 @@ cc_library { 
        "android.hardware.graphics.common@1.0",

    ],

}



genrule {

    name: "android.hardware.camera.device@3.3-adapter-helper_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",

    srcs: [

        ":android.hardware.camera.device@3.3_hal",

    ],

    out: [

        "android/hardware/camera/device/3.3/ACameraDeviceSession.cpp",

    ],

}



genrule {

    name: "android.hardware.camera.device@3.3-adapter-helper_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",

    srcs: [

        ":android.hardware.camera.device@3.3_hal",

    ],

    out: [

        "android/hardware/camera/device/3.3/ACameraDeviceSession.h",

    ],

}





cc_library {

    name: "android.hardware.camera.device@3.3-adapter-helper",

    defaults: ["hidl-module-defaults"],

    generated_sources: ["android.hardware.camera.device@3.3-adapter-helper_genc++"],

    generated_headers: ["android.hardware.camera.device@3.3-adapter-helper_genc++_headers"],

    export_generated_headers: ["android.hardware.camera.device@3.3-adapter-helper_genc++_headers"],

    vendor_available: true,

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libhidladapter",

        "android.hardware.camera.common@1.0",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.device@3.3",

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

        "android.hardware.camera.device@3.2-adapter-helper",

        "android.hidl.base@1.0-adapter-helper",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libhidladapter",

        "android.hardware.camera.common@1.0",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.device@3.3",

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

        "android.hardware.camera.device@3.2-adapter-helper",

        "android.hidl.base@1.0-adapter-helper",

    ],

}



genrule {

    name: "android.hardware.camera.device@3.3-adapter_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",

    out: ["main.cpp"]

}



cc_test {

    name: "android.hardware.camera.device@3.3-adapter",

    shared_libs: [

        "libhidladapter",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "android.hardware.camera.common@1.0",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.device@3.3",

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

        "android.hardware.camera.device@3.3-adapter-helper",

    ],

    generated_sources: ["android.hardware.camera.device@3.3-adapter_genc++"],

}

camera/provider/2.4/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ cc_library { 
        "android.hardware.camera.common@1.0",

        "android.hardware.camera.device@1.0",

        "android.hardware.camera.device@3.2",

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

    ],

    export_shared_lib_headers: [

        "libhidlbase",
@@ -72,7 +71,6 @@ cc_library { 
        "android.hardware.camera.common@1.0",

        "android.hardware.camera.device@1.0",

        "android.hardware.camera.device@3.2",

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

    ],

}
@@ -122,7 +120,6 @@ cc_library { 
        "android.hardware.camera.device@1.0",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.provider@2.4",

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

        "android.hardware.camera.device@1.0-adapter-helper",

        "android.hardware.camera.device@3.2-adapter-helper",

        "android.hidl.base@1.0-adapter-helper",
@@ -137,7 +134,6 @@ cc_library { 
        "android.hardware.camera.device@1.0",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.provider@2.4",

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

        "android.hardware.camera.device@1.0-adapter-helper",

        "android.hardware.camera.device@3.2-adapter-helper",

        "android.hidl.base@1.0-adapter-helper",
@@ -162,7 +158,6 @@ cc_test { 
        "android.hardware.camera.device@1.0",

        "android.hardware.camera.device@3.2",

        "android.hardware.camera.provider@2.4",

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

        "android.hardware.camera.provider@2.4-adapter-helper",

    ],

    generated_sources: ["android.hardware.camera.provider@2.4-adapter_genc++"],

cas/1.0/Android.bp

+80 −0
Original line number Diff line number Diff line
@@ -85,3 +85,83 @@ cc_library { 
        "libutils",

    ],

}



genrule {

    name: "android.hardware.cas@1.0-adapter-helper_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0",

    srcs: [

        ":android.hardware.cas@1.0_hal",

    ],

    out: [

        "android/hardware/cas/1.0/ACas.cpp",

        "android/hardware/cas/1.0/ACasListener.cpp",

        "android/hardware/cas/1.0/ADescramblerBase.cpp",

        "android/hardware/cas/1.0/AMediaCasService.cpp",

    ],

}



genrule {

    name: "android.hardware.cas@1.0-adapter-helper_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0",

    srcs: [

        ":android.hardware.cas@1.0_hal",

    ],

    out: [

        "android/hardware/cas/1.0/ACas.h",

        "android/hardware/cas/1.0/ACasListener.h",

        "android/hardware/cas/1.0/ADescramblerBase.h",

        "android/hardware/cas/1.0/AMediaCasService.h",

    ],

}





cc_library {

    name: "android.hardware.cas@1.0-adapter-helper",

    defaults: ["hidl-module-defaults"],

    generated_sources: ["android.hardware.cas@1.0-adapter-helper_genc++"],

    generated_headers: ["android.hardware.cas@1.0-adapter-helper_genc++_headers"],

    export_generated_headers: ["android.hardware.cas@1.0-adapter-helper_genc++_headers"],

    vendor_available: true,

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libhidladapter",

        "android.hardware.cas@1.0",

        "android.hidl.base@1.0-adapter-helper",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libhidladapter",

        "android.hardware.cas@1.0",

        "android.hidl.base@1.0-adapter-helper",

    ],

}



genrule {

    name: "android.hardware.cas@1.0-adapter_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0",

    out: ["main.cpp"]

}



cc_test {

    name: "android.hardware.cas@1.0-adapter",

    shared_libs: [

        "libhidladapter",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "android.hardware.cas@1.0",

        "android.hardware.cas@1.0-adapter-helper",

    ],

    generated_sources: ["android.hardware.cas@1.0-adapter_genc++"],

}

cas/Android.bp

+1 −1
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "1.0",

    "1.0/vts/functional",

    "1.0/default",

    "1.0/vts/functional",

    "native/1.0",

]

cas/native/1.0/Android.bp

+79 −0
Original line number Diff line number Diff line
@@ -66,3 +66,82 @@ cc_library { 
        "android.hardware.cas@1.0",

    ],

}



genrule {

    name: "android.hardware.cas.native@1.0-adapter-helper_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0",

    srcs: [

        ":android.hardware.cas.native@1.0_hal",

    ],

    out: [

        "android/hardware/cas/native/1.0/ADescrambler.cpp",

    ],

}



genrule {

    name: "android.hardware.cas.native@1.0-adapter-helper_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0",

    srcs: [

        ":android.hardware.cas.native@1.0_hal",

    ],

    out: [

        "android/hardware/cas/native/1.0/ADescrambler.h",

    ],

}





cc_library {

    name: "android.hardware.cas.native@1.0-adapter-helper",

    defaults: ["hidl-module-defaults"],

    generated_sources: ["android.hardware.cas.native@1.0-adapter-helper_genc++"],

    generated_headers: ["android.hardware.cas.native@1.0-adapter-helper_genc++_headers"],

    export_generated_headers: ["android.hardware.cas.native@1.0-adapter-helper_genc++_headers"],

    vendor_available: true,

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libhidladapter",

        "android.hardware.cas.native@1.0",

        "android.hardware.cas@1.0",

        "android.hardware.cas@1.0-adapter-helper",

        "android.hidl.base@1.0-adapter-helper",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libhidladapter",

        "android.hardware.cas.native@1.0",

        "android.hardware.cas@1.0",

        "android.hardware.cas@1.0-adapter-helper",

        "android.hidl.base@1.0-adapter-helper",

    ],

}



genrule {

    name: "android.hardware.cas.native@1.0-adapter_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0",

    out: ["main.cpp"]

}



cc_test {

    name: "android.hardware.cas.native@1.0-adapter",

    shared_libs: [

        "libhidladapter",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "android.hardware.cas.native@1.0",

        "android.hardware.cas@1.0",

        "android.hardware.cas.native@1.0-adapter-helper",

    ],

    generated_sources: ["android.hardware.cas.native@1.0-adapter_genc++"],

}