Skip to content

Commit

Permalink
Merge "Convert libusbhost to Android.bp"
Browse files Browse the repository at this point in the history
  • Loading branch information
Treehugger Robot authored and Gerrit Code Review committed Apr 20, 2017
2 parents e32517d + a5c6017 commit a58c4b5
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 57 deletions.
35 changes: 35 additions & 0 deletions libusbhost/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//
// 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,
},
},
}
56 changes: 0 additions & 56 deletions libusbhost/Android.mk

This file was deleted.

2 changes: 1 addition & 1 deletion libusbhost/usbhost.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#ifdef USE_LIBLOG
#define LOG_TAG "usbhost"
#include "utils/Log.h"
#include "log/log.h"
#define D ALOGD
#else
#define D printf
Expand Down

0 comments on commit a58c4b5

Please sign in to comment.