Fix mac build breakage due to missing usb_osx.cpp in
Android.cpp file for libfastboot2 https://android-review.googlesource.com/c/platform/system/core/+/722153 Test: Build on osx Change-Id: I6151e37581ac332e4d5cfb5e40feb3ea0e3093df
This commit is contained in:
parent
c86b01baa1
commit
a5ad20aecc
2 changed files with 29 additions and 0 deletions
|
|
@ -12,6 +12,8 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// This is required because no Android.bp can include a library defined in an
|
||||
// Android.mk. Eventually should kill libfastboot (defined in Android.mk)
|
||||
cc_library_host_static {
|
||||
name: "libfastboot2",
|
||||
|
||||
|
|
@ -56,6 +58,23 @@ cc_library_host_static {
|
|||
linux: {
|
||||
srcs: ["usb_linux.cpp"],
|
||||
},
|
||||
|
||||
darwin: {
|
||||
srcs: ["usb_osx.cpp"],
|
||||
|
||||
host_ldlibs: [
|
||||
"-framework CoreFoundation",
|
||||
"-framework IOKit",
|
||||
],
|
||||
},
|
||||
|
||||
windows: {
|
||||
srcs: ["usb_windows.cpp"],
|
||||
|
||||
host_ldlibs: [
|
||||
"-lws2_32",
|
||||
],
|
||||
},
|
||||
},
|
||||
|
||||
cflags: [
|
||||
|
|
|
|||
|
|
@ -28,4 +28,14 @@ cc_test_host {
|
|||
"libsparse",
|
||||
],
|
||||
|
||||
// Static libs (libfastboot2) shared library dependencies are not transitively included
|
||||
// This is needed to avoid link time errors when building for mac
|
||||
target: {
|
||||
darwin: {
|
||||
host_ldlibs: [
|
||||
"-framework CoreFoundation",
|
||||
"-framework IOKit",
|
||||
],
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue