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

am 631cf146: Merge "Fix windows adb build"

Browse source 
* commit '631cf146274e4f0ef425fd491d39c969a20628a1':
  Fix windows adb build
This commit is contained in:
Colin Cross 2015-04-20 20:18:56 +00:00 • committed by Android Git Automerger
commit 6de70784ef
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/Android.mk
View file

@ -165,7 +165,10 @@ LOCAL_STATIC_LIBRARIES := \
libcutils \ libcutils \
$(EXTRA_STATIC_LIBS) \ $(EXTRA_STATIC_LIBS) \
LOCAL_CXX_STL := libc++_static # libc++ not available on windows yet
ifneq ($(HOST_OS),windows)
LOCAL_CXX_STL := libc++_static
endif
# Don't add anything here, we don't want additional shared dependencies # Don't add anything here, we don't want additional shared dependencies
# on the host adb tool, and shared libraries that link against libc++ # on the host adb tool, and shared libraries that link against libc++

5
fastboot/Android.mk
View file

@ -74,7 +74,10 @@ LOCAL_REQUIRED_MODULES := libf2fs_fmt_host_dyn
LOCAL_STATIC_LIBRARIES += libf2fs_utils_host libf2fs_ioutils_host libf2fs_dlutils_host LOCAL_STATIC_LIBRARIES += libf2fs_utils_host libf2fs_ioutils_host libf2fs_dlutils_host
endif endif
LOCAL_CXX_STL := libc++_static # libc++ not available on windows yet
ifneq ($(HOST_OS),windows)
LOCAL_CXX_STL := libc++_static
endif
# Don't add anything here, we don't want additional shared dependencies # Don't add anything here, we don't want additional shared dependencies
# on the host fastboot tool, and shared libraries that link against libc++ # on the host fastboot tool, and shared libraries that link against libc++