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

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

Merge "Fix mac build (ldflags -> ldlibs)" am: 1b2f2ee6 

am: 808c7351

Change-Id: I1ae0648fdf3706260c476a5ac398d7cc05d43e33
parents 64673e14 808c7351

fastboot/Android.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ LOCAL_CFLAGS := $(fastboot_cflags) 
LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)

LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)

LOCAL_CXX_STL := $(fastboot_stl)

LOCAL_CXX_STL := $(fastboot_stl)

LOCAL_HEADER_LIBRARIES := bootimg_headers

LOCAL_HEADER_LIBRARIES := bootimg_headers

LOCAL_LDLIBS_darwin := $(fastboot_ldflags_darwin)

LOCAL_LDLIBS_darwin := $(fastboot_ldlibs_darwin)

LOCAL_LDLIBS_windows := $(fastboot_ldlibs_windows)

LOCAL_LDLIBS_windows := $(fastboot_ldlibs_windows)

LOCAL_SHARED_LIBRARIES := $(fastboot_shared_libs)

LOCAL_SHARED_LIBRARIES := $(fastboot_shared_libs)

LOCAL_STATIC_LIBRARIES := $(fastboot_static_libs)

LOCAL_STATIC_LIBRARIES := $(fastboot_static_libs)
@@ -84,7 +84,7 @@ LOCAL_CFLAGS := $(fastboot_cflags) 
LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)

LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)

LOCAL_CXX_STL := $(fastboot_stl)

LOCAL_CXX_STL := $(fastboot_stl)

LOCAL_HEADER_LIBRARIES := bootimg_headers

LOCAL_HEADER_LIBRARIES := bootimg_headers

LOCAL_LDLIBS_darwin := $(fastboot_ldflags_darwin)

LOCAL_LDLIBS_darwin := $(fastboot_ldlibs_darwin)

LOCAL_LDLIBS_windows := $(fastboot_ldlibs_windows)

LOCAL_LDLIBS_windows := $(fastboot_ldlibs_windows)

LOCAL_REQUIRED_MODULES := mke2fs make_f2fs

LOCAL_REQUIRED_MODULES := mke2fs make_f2fs

LOCAL_REQUIRED_MODULES_darwin := e2fsdroid mke2fs.conf sload_f2fs

LOCAL_REQUIRED_MODULES_darwin := e2fsdroid mke2fs.conf sload_f2fs
@@ -132,7 +132,7 @@ LOCAL_CFLAGS := $(fastboot_cflags) 
LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)

LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)

LOCAL_CXX_STL := $(fastboot_stl)

LOCAL_CXX_STL := $(fastboot_stl)

LOCAL_HEADER_LIBRARIES := bootimg_headers

LOCAL_HEADER_LIBRARIES := bootimg_headers

LOCAL_LDLIBS_darwin := $(fastboot_ldflags_darwin)

LOCAL_LDLIBS_darwin := $(fastboot_ldlibs_darwin)

LOCAL_LDLIBS_windows := $(fastboot_ldlibs_windows)

LOCAL_LDLIBS_windows := $(fastboot_ldlibs_windows)

LOCAL_SHARED_LIBRARIES := $(fastboot_shared_libs)

LOCAL_SHARED_LIBRARIES := $(fastboot_shared_libs)

LOCAL_SHARED_LIBRARIES_windows := AdbWinApi

LOCAL_SHARED_LIBRARIES_windows := AdbWinApi