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

Commit 3baa8b6e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-7f84484c-eec6-4577-8d5a-55079be4f3c5-for-git_oc-mr1-release-42...

release-request-7f84484c-eec6-4577-8d5a-55079be4f3c5-for-git_oc-mr1-release-4262309 snap-temp-L02100000091441105

Change-Id: I2248905cf4903950e78c62b8cf0c6bf3e8f6cd3b
parents 740d36ef 43b3865a
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
eisenbach@google.com
mylesgw@google.com
pavlin@google.com
+5 −0
Original line number Diff line number Diff line
@@ -226,6 +226,11 @@ bool VendorInterface::Open(InitializeCompleteCallback initialize_complete_cb,
  int fd_list[CH_MAX] = {0};
  int fd_count = lib_interface_->op(BT_VND_OP_USERIAL_OPEN, &fd_list);

  if (fd_count < 1 || fd_count > CH_MAX - 1) {
    ALOGE("%s: fd_count %d is invalid!", __func__, fd_count);
    return false;
  }

  for (int i = 0; i < fd_count; i++) {
    if (fd_list[i] == INVALID_FD) {
      ALOGE("%s: fd %d is invalid!", __func__, fd_list[i]);
+8 −20
Original line number Diff line number Diff line
@@ -44,33 +44,21 @@ cc_library_static {

cc_test {
    name: "VtsHalGraphicsComposerV2_1TargetTest",
    defaults: ["hidl_defaults"],
    defaults: ["VtsHalTargetTestDefaults"],
    srcs: ["VtsHalGraphicsComposerV2_1TargetTest.cpp"],

    // TODO(b/64437680): Assume these libs are always available on the device.
    shared_libs: [
        "android.hardware.graphics.allocator@2.0",
        "android.hardware.graphics.composer@2.1",
        "android.hardware.graphics.mapper@2.0",
        "libbase",
        "libcutils",
        "libfmq",
        "libhidlbase",
        "libhidltransport",
        "liblog",
        "libnativehelper",
        "libsync",
        "libutils",
    ],
    static_libs: [
        "libhwcomposer-command-buffer",
        "android.hardware.graphics.allocator@2.0",
        "android.hardware.graphics.composer@2.1",
        "android.hardware.graphics.mapper@2.0",
        "libVtsHalGraphicsComposerTestUtils",
        "libVtsHalGraphicsMapperTestUtils",
        "VtsHalHidlTargetTestBase",
        "libhwcomposer-command-buffer",
        "libnativehelper",
    ],
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
        "-O0",
        "-g",
    ]
}
+4 −18
Original line number Diff line number Diff line
@@ -37,30 +37,16 @@ cc_library_static {

cc_test {
    name: "VtsHalGraphicsMapperV2_0TargetTest",
    defaults: ["hidl_defaults"],
    defaults: ["VtsHalTargetTestDefaults"],
    srcs: ["VtsHalGraphicsMapperV2_0TargetTest.cpp"],
    shared_libs: [
        "libbase",
        "liblog",
        "libcutils",
        "libhidlbase",
        "libhidltransport",
        "libnativehelper",
        "libsync",
        "libutils",
    ],
    static_libs: [
        "android.hardware.graphics.allocator@2.0",
        "android.hardware.graphics.mapper@2.0",
        "android.hardware.graphics.common@1.0",
    ],
    static_libs: [
        "libVtsHalGraphicsMapperTestUtils",
        "VtsHalHidlTargetTestBase",
        "libnativehelper",
    ],
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
        "-O0",
        "-g",
    ]
}
+8 −54
Original line number Diff line number Diff line
@@ -16,65 +16,19 @@

cc_test {
    name: "VtsHalMediaOmxV1_0TargetAudioEncTest",
    defaults: ["hidl_defaults"],
    srcs: ["VtsHalMediaOmxV1_0TargetAudioEncTest.cpp",
           "media_audio_hidl_test_common.cpp"],
    shared_libs: [
        "libbase",
        "liblog",
        "libcutils",
        "libhidlbase",
        "libhidlmemory",
        "libhidltransport",
        "libhwbinder",
        "libnativehelper",
        "libutils",
        "libstagefright_foundation",
        "android.hidl.allocator@1.0",
        "android.hidl.memory@1.0",
        "android.hardware.media.omx@1.0",
    ],
    static_libs: ["VtsHalHidlTargetTestBase",
                  "VtsHalMediaOmxV1_0CommonUtil"],
    cflags: [
        "-O0",
        "-g",
    ],
    include_dirs: [
        "frameworks/native/include/media/openmax/",
        "hardware/interfaces/media/omx/1.0/vts/functional/common",
    defaults: ["VtsHalMediaOmxV1_0Defaults"],
    srcs: [
        "VtsHalMediaOmxV1_0TargetAudioEncTest.cpp",
        "media_audio_hidl_test_common.cpp"
    ],
}

cc_test {
    name: "VtsHalMediaOmxV1_0TargetAudioDecTest",
    defaults: ["hidl_defaults"],
    srcs: ["VtsHalMediaOmxV1_0TargetAudioDecTest.cpp",
           "media_audio_hidl_test_common.cpp"],
    shared_libs: [
        "libbase",
        "liblog",
        "libcutils",
        "libhidlbase",
        "libhidlmemory",
        "libhidltransport",
        "libhwbinder",
        "libnativehelper",
        "libutils",
        "libstagefright_foundation",
        "android.hidl.allocator@1.0",
        "android.hidl.memory@1.0",
        "android.hardware.media.omx@1.0",
    ],
    static_libs: ["VtsHalHidlTargetTestBase",
                  "VtsHalMediaOmxV1_0CommonUtil"],
    cflags: [
        "-O0",
        "-g",
    ],
    include_dirs: [
        "frameworks/native/include/media/openmax/",
        "hardware/interfaces/media/omx/1.0/vts/functional/common",
    defaults: ["VtsHalMediaOmxV1_0Defaults"],
    srcs: [
        "VtsHalMediaOmxV1_0TargetAudioDecTest.cpp",
        "media_audio_hidl_test_common.cpp"
    ],
}

Loading