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

Commit 6db81856 authored by Austin Borger's avatar Austin Borger
Browse files

cameraservice_test: Create host-side build. 

Some tests can run on the host. This patch creates a new build on the
host with the ExifUtilsTest only. Additional tests will be added in
future patches.

Bug: 207411352
Test: Ran test on gLinux.
Change-Id: Ia1c04f1987b65f93519bacda98bafed1881f2386
parent 63697e06

camera/Android.bp

+24 −0
Original line number Diff line number Diff line
@@ -113,6 +113,30 @@ cc_library_shared { 


}



cc_library_host_static {

    name: "libcamera_client_host",



    srcs: [

        "CameraMetadata.cpp",

        "VendorTagDescriptor.cpp",

    ],



    shared_libs: [

        "libbase",

        "libcamera_metadata",

    ],



    include_dirs: [

        "system/media/private/camera/include",

        "frameworks/native/include/media/openmax",

    ],



    export_include_dirs: [

        "include",

        "include/camera"

    ],

}



// AIDL interface between camera clients and the camera service.

filegroup {

    name: "libcamera_client_aidl",

services/camera/libcameraservice/Android.bp

+36 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ cc_library_shared { 
        "utils/CameraThreadState.cpp",

        "utils/CameraTraces.cpp",

        "utils/AutoConditionLock.cpp",

        "utils/ExifUtils.cpp",

        "utils/SessionConfigurationUtils.cpp",

        "utils/SessionStatsBuilder.cpp",

        "utils/TagMonitor.cpp",
@@ -164,6 +163,7 @@ cc_library_shared { 
        "libprocessinfoservice_aidl",

        "libbinderthreadstateutils",

        "media_permission-aidl-cpp",

        "libcameraservice_host",

    ],



    export_shared_lib_headers: [
@@ -193,3 +193,38 @@ cc_library_shared { 
    ],



}



cc_library_static {

    name: "libcameraservice_host",

    host_supported: true,



    // Camera service source



    srcs: [

        "utils/ExifUtils.cpp",

    ],



    shared_libs: [

        "libbase",

        "libbinder",

        "libcamera_metadata",

        "libexif",

        "liblog",

        "libutils",

    ],



    include_dirs: [

        "frameworks/av/camera/include",

        "frameworks/av/camera/include/camera",

    ],



    export_include_dirs: ["."],



    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-Wno-ignored-qualifiers",

    ],



}
 
 No newline at end of file

services/camera/libcameraservice/tests/Android.bp

+37 −0
Original line number Diff line number Diff line
@@ -75,3 +75,40 @@ cc_test { 
    test_suites: ["device-tests"],



}



cc_test_host {

    name: "cameraservice_test_host",



    include_dirs: [

        "frameworks/av/camera/include",

        "frameworks/av/camera/include/camera",

    ],



    shared_libs: [

        "libbase",

        "libbinder",

        "libcamera_metadata",

        "libexif",

        "liblog",

        "libutils",

    ],



    static_libs: [

        "libcamera_client_host",

        "libcameraservice_host",

        "libgmock",

    ],



    srcs: [

        "ExifUtilsTest.cpp",

    ],



    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

    ],



    test_suites: ["device-tests"],



}
 
 No newline at end of file