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

Commit aeea8c3d authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge changes from topic "camera-explicit-deps" am: a791090a 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2368989



Change-Id: Ic140018d35c25c17e1c5eac07de269187e58dd74
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22380064 a791090a

camera/device/aidl/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ aidl_interface { 
    imports: [

        "android.hardware.common-V2",

        "android.hardware.common.fmq-V1",

        "android.hardware.camera.common",

        "android.hardware.camera.metadata",

        "android.hardware.graphics.common",

        "android.hardware.camera.common-V1",

        "android.hardware.camera.metadata-V1",

        "android.hardware.graphics.common-V4",

    ],

    backend: {

        cpp: {

camera/provider/aidl/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ aidl_interface { 
        "android/hardware/camera/provider/*.aidl",

    ],

    imports: [

        "android.hardware.camera.device",

        "android.hardware.camera.common",

        "android.hardware.camera.device-V1",

        "android.hardware.camera.common-V1",

    ],

    stability: "vintf",

    backend: {