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

Commit b49ef275 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Convert Android.mk to Android.bp under frameworks/av/camera" into main

parents 3857c532 5d96bb46
Loading
Loading
Loading
Loading

camera/Android.mk

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line
# Copyright 2010 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

include $(call all-subdir-makefiles)
+52 −0
Original line number Diff line number Diff line
// Copyright 2013 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package {
    // See: http://go/android-license-faq
    default_applicable_licenses: [
        "frameworks_av_camera_license",
    ],
}

cc_test {
    name: "camera_client_test",
    srcs: [
        "VendorTagDescriptorTests.cpp",
        "CameraBinderTests.cpp",
        "CameraZSLTests.cpp",
        "CameraCharacteristicsPermission.cpp",
    ],
    shared_libs: [
        "liblog",
        "libutils",
        "libcutils",
        "libcamera_metadata",
        "libcamera_client",
        "libgui",
        "libsync",
        "libui",
        "libdl",
        "libbinder",
    ],
    include_dirs: [
        "system/media/private/camera/include",
        "system/media/camera/tests",
        "frameworks/av/services/camera/libcameraservice",
    ],
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
    ],
}

camera/tests/Android.mk

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line
# Copyright 2013 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_SRC_FILES:= \
	VendorTagDescriptorTests.cpp \
	CameraBinderTests.cpp \
	CameraZSLTests.cpp \
	CameraCharacteristicsPermission.cpp

LOCAL_SHARED_LIBRARIES := \
	liblog \
	libutils \
	libcutils \
	libcamera_metadata \
	libcamera_client \
	libgui \
	libsync \
	libui \
	libdl \
	libbinder

LOCAL_C_INCLUDES += \
	system/media/private/camera/include \
	system/media/camera/tests \
	frameworks/av/services/camera/libcameraservice \

LOCAL_CFLAGS += -Wall -Wextra -Werror

LOCAL_MODULE:= camera_client_test
LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../NOTICE
LOCAL_MODULE_TAGS := tests

include $(BUILD_NATIVE_TEST)