ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't include mDNS support on platforms other than Linux am: d6c8091e9f

Browse source 
am: cef0c7cf7d

Change-Id: Ibc4115bed3614554ad7853928aee3c16937dfc9b
This commit is contained in:
Casey Dahlin 2017-03-10 01:21:11 +00:00 • committed by android-build-merger
commit e7a31f3ef7
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
adb/Android.mk
View file

@ -143,19 +143,22 @@ LOCAL_CFLAGS_linux := $(LIBADB_linux_CFLAGS)
LOCAL_CFLAGS_darwin := $(LIBADB_darwin_CFLAGS) LOCAL_CFLAGS_darwin := $(LIBADB_darwin_CFLAGS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LIBADB_SRC_FILES) \ $(LIBADB_SRC_FILES) \
adb_auth_host.cpp \ adb_auth_host.cpp
transport_mdns.cpp
LOCAL_SRC_FILES_darwin := $(LIBADB_darwin_SRC_FILES) LOCAL_SRC_FILES_darwin := $(LIBADB_darwin_SRC_FILES)
LOCAL_SRC_FILES_linux := $(LIBADB_linux_SRC_FILES) LOCAL_SRC_FILES_linux := $(LIBADB_linux_SRC_FILES)
LOCAL_SRC_FILES_windows := $(LIBADB_windows_SRC_FILES) LOCAL_SRC_FILES_windows := $(LIBADB_windows_SRC_FILES)
LOCAL_SRC_FILES_linux += transport_mdns.cpp
LOCAL_SRC_FILES_darwin += transport_mdns_unsupported.cpp
LOCAL_SRC_FILES_windows += transport_mdns_unsupported.cpp
LOCAL_SANITIZE := $(adb_host_sanitize) LOCAL_SANITIZE := $(adb_host_sanitize)
# Even though we're building a static library (and thus there's no link step for # Even though we're building a static library (and thus there's no link step for
# this to take effect), this adds the includes to our path. # this to take effect), this adds the includes to our path.
LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase libmdnssd LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase
LOCAL_STATIC_LIBRARIES_linux := libusb LOCAL_STATIC_LIBRARIES_linux := libusb libmdnssd
LOCAL_STATIC_LIBRARIES_darwin := libusb LOCAL_STATIC_LIBRARIES_darwin := libusb
LOCAL_C_INCLUDES_windows := development/host/windows/usb/api/ LOCAL_C_INCLUDES_windows := development/host/windows/usb/api/
@ -224,10 +227,9 @@ LOCAL_STATIC_LIBRARIES := \
libcrypto \ libcrypto \
libcutils \ libcutils \
libdiagnose_usb \ libdiagnose_usb \
libgmock_host \ libgmock_host
libmdnssd \
LOCAL_STATIC_LIBRARIES_linux := libusb LOCAL_STATIC_LIBRARIES_linux := libusb libmdnssd
LOCAL_STATIC_LIBRARIES_darwin := libusb LOCAL_STATIC_LIBRARIES_darwin := libusb
# Set entrypoint to wmain from sysdeps_win32.cpp instead of main # Set entrypoint to wmain from sysdeps_win32.cpp instead of main
@ -292,12 +294,11 @@ LOCAL_STATIC_LIBRARIES := \
libcrypto_utils \ libcrypto_utils \
libcrypto \ libcrypto \
libdiagnose_usb \ libdiagnose_usb \
liblog \ liblog
libmdnssd \
# Don't use libcutils on Windows. # Don't use libcutils on Windows.
LOCAL_STATIC_LIBRARIES_darwin := libcutils LOCAL_STATIC_LIBRARIES_darwin := libcutils
LOCAL_STATIC_LIBRARIES_linux := libcutils LOCAL_STATIC_LIBRARIES_linux := libcutils libmdnssd
LOCAL_STATIC_LIBRARIES_darwin += libusb LOCAL_STATIC_LIBRARIES_darwin += libusb
LOCAL_STATIC_LIBRARIES_linux += libusb LOCAL_STATIC_LIBRARIES_linux += libusb

18
adb/transport_mdns_unsupported.cpp Normal file
View file

@ -0,0 +1,18 @@
/*
* Copyright (C) 2016 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.
*/
/* For when mDNS discovery is unsupported */
void init_mdns_transport_discovery(void) {}