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

am 9336ee38: Merge "Fix (Windows) build."

Browse source 
* commit '9336ee389f79296d04790d1a1dab6f55b6a4c221':
  Fix (Windows) build.
This commit is contained in:
Elliott Hughes 2015-09-11 23:23:52 +00:00 • committed by Android Git Automerger
commit e917d8ed62
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/Android.mk
View file

@ -133,6 +133,8 @@ LOCAL_SRC_FILES := \
$(LIBADB_TEST_SRCS) \ $(LIBADB_TEST_SRCS) \
$(LIBADB_TEST_linux_SRCS) \ $(LIBADB_TEST_linux_SRCS) \
shell_service_protocol.cpp \ shell_service_protocol.cpp \
LOCAL_SRC_FILES_linux := \
shell_service_protocol_test.cpp \ shell_service_protocol_test.cpp \
LOCAL_SANITIZE := $(adb_target_sanitize) LOCAL_SANITIZE := $(adb_target_sanitize)
@ -153,9 +155,11 @@ LOCAL_SRC_FILES := \
$(LIBADB_TEST_SRCS) \ $(LIBADB_TEST_SRCS) \
services.cpp \ services.cpp \
shell_service_protocol.cpp \ shell_service_protocol.cpp \
LOCAL_SRC_FILES_linux := \
$(LIBADB_TEST_linux_SRCS) \
shell_service_protocol_test.cpp \ shell_service_protocol_test.cpp \
LOCAL_SRC_FILES_linux := $(LIBADB_TEST_linux_SRCS)
LOCAL_SRC_FILES_darwin := $(LIBADB_TEST_darwin_SRCS) LOCAL_SRC_FILES_darwin := $(LIBADB_TEST_darwin_SRCS)
LOCAL_SRC_FILES_windows := $(LIBADB_TEST_windows_SRCS) LOCAL_SRC_FILES_windows := $(LIBADB_TEST_windows_SRCS)
LOCAL_SANITIZE := $(adb_host_sanitize) LOCAL_SANITIZE := $(adb_host_sanitize)