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

Commit a791090a authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge changes from topic "camera-explicit-deps" 

* changes:
  specify import version (camera)
  Mark modules frozen explicitly (II)
parents 6a891fd2 000068d6

camera/common/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ aidl_interface { 
    name: "android.hardware.camera.common",

    vendor_available: true,

    srcs: ["android/hardware/camera/common/*.aidl"],

    frozen: true,

    stability: "vintf",

    backend: {

        cpp: {

camera/device/aidl/Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -11,13 +11,14 @@ aidl_interface { 
    name: "android.hardware.camera.device",

    vendor_available: true,

    srcs: ["android/hardware/camera/device/*.aidl"],

    frozen: true,

    stability: "vintf",

    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/metadata/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ aidl_interface { 
    name: "android.hardware.camera.metadata",

    vendor_available: true,

    srcs: ["android/hardware/camera/metadata/*.aidl"],

    frozen: true,

    stability: "vintf",

    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: {