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

Commit 7f305f98 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit 'e3082990':
  Fix (Windows) build.
parents efeef977 e3082990

adb/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ LOCAL_SRC_FILES := \ 
    $(LIBADB_TEST_SRCS) \

    $(LIBADB_TEST_linux_SRCS) \

    shell_service_protocol.cpp \



LOCAL_SRC_FILES_linux := \

    shell_service_protocol_test.cpp \



LOCAL_SANITIZE := $(adb_target_sanitize)
@@ -153,9 +155,11 @@ LOCAL_SRC_FILES := \ 
    $(LIBADB_TEST_SRCS) \

    services.cpp \

    shell_service_protocol.cpp \



LOCAL_SRC_FILES_linux := \

    $(LIBADB_TEST_linux_SRCS) \

    shell_service_protocol_test.cpp \



LOCAL_SRC_FILES_linux := $(LIBADB_TEST_linux_SRCS)

LOCAL_SRC_FILES_darwin := $(LIBADB_TEST_darwin_SRCS)

LOCAL_SRC_FILES_windows := $(LIBADB_TEST_windows_SRCS)

LOCAL_SANITIZE := $(adb_host_sanitize)