Merge "Fix mac build breakage due to missing usb_osx.cpp in Android.cpp file for libfastboot2" (a37dada0) · Commits · e / os / android_system_core

fastboot/Android.bp

+19 −0

Original line number	Diff line number	Diff line
		@@ -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: [

+10 −0

Original line number	Diff line number	Diff line
		@@ -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",
		],
		},
		}
		}