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

Commit 33435d74 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by android-build-merger
Browse files

Merge "Convert libmtp to soong." am: 3f877d49

am: 1cd753b1

Change-Id: Icf972d53e2b8b7f0201fe180598db02bb36d1b23
parents 8315f9e8 1cd753b1
Loading
Loading
Loading
Loading

media/mtp/Android.bp

0 → 100644
+57 −0
Original line number Original line Diff line number Diff line
//
// Copyright (C) 2017 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.
//

cc_library_shared {
    name: "libmtp",
    srcs: [
        "AsyncIO.cpp",
        "MtpDataPacket.cpp",
        "MtpDebug.cpp",
        "MtpDevHandle.cpp",
        "MtpDevice.cpp",
        "MtpDeviceInfo.cpp",
        "MtpEventPacket.cpp",
        "MtpFfsHandle.cpp",
        "MtpObjectInfo.cpp",
        "MtpPacket.cpp",
        "MtpProperty.cpp",
        "MtpRequestPacket.cpp",
        "MtpResponsePacket.cpp",
        "MtpServer.cpp",
        "MtpStorage.cpp",
        "MtpStorageInfo.cpp",
        "MtpStringBuffer.cpp",
        "MtpUtils.cpp",
    ],
    export_include_dirs: ["."],
    cflags: [
        "-DMTP_DEVICE",
        "-DMTP_HOST",
        "-Wall",
        "-Wextra",
        "-Werror",
    ],
    shared_libs: [
        "libbase",
        "libutils",
        "liblog",
        "libusbhost",
    ],
}

subdirs = [
    "tests",
]

media/mtp/Android.mk

deleted100644 → 0
+0 −49
Original line number Original line Diff line number Diff line
#
# Copyright (C) 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.
#

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=                                       \
                  AsyncIO.cpp                           \
                  MtpDataPacket.cpp                     \
                  MtpDebug.cpp                          \
                  MtpDevHandle.cpp                      \
                  MtpDevice.cpp                         \
                  MtpDeviceInfo.cpp                     \
                  MtpEventPacket.cpp                    \
                  MtpFfsHandle.cpp                      \
                  MtpObjectInfo.cpp                     \
                  MtpPacket.cpp                         \
                  MtpProperty.cpp                       \
                  MtpRequestPacket.cpp                  \
                  MtpResponsePacket.cpp                 \
                  MtpServer.cpp                         \
                  MtpStorage.cpp                        \
                  MtpStorageInfo.cpp                    \
                  MtpStringBuffer.cpp                   \
                  MtpUtils.cpp                          \

LOCAL_MODULE:= libmtp

LOCAL_CFLAGS := -DMTP_DEVICE -DMTP_HOST -Wall -Wextra -Werror

LOCAL_SHARED_LIBRARIES := libbase libutils libcutils liblog libusbhost libbinder

include $(BUILD_SHARED_LIBRARY)

include $(call all-makefiles-under,$(LOCAL_PATH))
+45 −0
Original line number Original line Diff line number Diff line
//
// Copyright (C) 2017 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.
//

cc_test {
    name: "mtp_ffs_handle_test",
    srcs: ["MtpFfsHandle_test.cpp"],
    shared_libs: [
        "libbase",
        "libmtp",
        "liblog",
    ],
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
    ],
}

cc_test {
    name: "async_io_test",
    srcs: ["AsyncIO_test.cpp"],
    shared_libs: [
        "libbase",
        "libmtp",
        "liblog",
    ],
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
    ],
}

media/mtp/tests/Android.mk

deleted100644 → 0
+0 −51
Original line number Original line Diff line number Diff line
# Build the unit tests.
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_MODULE := mtp_ffs_handle_test

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := \
	MtpFfsHandle_test.cpp \

LOCAL_SHARED_LIBRARIES := \
	libbase \
	libcutils \
	libmedia \
	libmtp \
	libutils \
	liblog

LOCAL_C_INCLUDES := \
	frameworks/av/media/mtp \

LOCAL_CFLAGS += -Werror -Wall

include $(BUILD_NATIVE_TEST)

include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_MODULE := async_io_test

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := \
	AsyncIO_test.cpp \

LOCAL_SHARED_LIBRARIES := \
	libbase \
	libcutils \
	libmedia \
	libmtp \
	libutils \
	liblog

LOCAL_C_INCLUDES := \
	frameworks/av/media/mtp \

LOCAL_CFLAGS += -Werror -Wall

include $(BUILD_NATIVE_TEST)