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

Commit 93f7b6a6 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Convert libusbhost to Android.bp" am: a58c4b5b am: dff208c8 

am: 720faf19

Change-Id: I2912da737533ddc553fa3d69a8c084bb0926a217
parents 56435873 720faf19

libusbhost/Android.bp

0 → 100644
+35 −0
Original line number 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.

//



cc_library {

    name: "libusbhost",

    host_supported: true,

    srcs: ["usbhost.c"],

    cflags: ["-Werror"],

    export_include_dirs: ["include"],

    target: {

        android: {

            cflags: [

                "-g",

                "-DUSE_LIBLOG",

            ],

            shared_libs: ["liblog"],

        },

        darwin: {

            enabled: false,

        },

    },

}

libusbhost/Android.mk

deleted100644 → 0
+0 −56
Original line number 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)



# Static library for Linux host

# ========================================================



ifeq ($(HOST_OS),linux)



include $(CLEAR_VARS)

LOCAL_MODULE := libusbhost

LOCAL_SRC_FILES := usbhost.c

LOCAL_CFLAGS := -Werror

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

include $(BUILD_HOST_STATIC_LIBRARY)



endif



# Shared library for target

# ========================================================



include $(CLEAR_VARS)

LOCAL_MODULE := libusbhost

LOCAL_SRC_FILES := usbhost.c

LOCAL_CFLAGS := -g -DUSE_LIBLOG -Werror

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

# needed for logcat

LOCAL_SHARED_LIBRARIES := libcutils

include $(BUILD_SHARED_LIBRARY)



# Static library for target

# ========================================================



include $(CLEAR_VARS)

LOCAL_MODULE := libusbhost

LOCAL_SRC_FILES := usbhost.c

LOCAL_CFLAGS := -Werror

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

include $(BUILD_STATIC_LIBRARY)

libusbhost/usbhost.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


#ifdef USE_LIBLOG

#define LOG_TAG "usbhost"

#include "utils/Log.h"

#include "log/log.h"

#define D ALOGD

#else

#define D printf