commit a78197fb9a179c3511a94f39d8326ae6461fc398
author Elliott Hughes <enh@google.com> Thu Apr 16 20:49:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 20:49:13 2015 +0000
tree a77e6a15556ab4164844822b64dd5ef2bf726572
parent 94ff2d970318416f8e1026833e3ee256284ca6c5
parent 549154d16f570aeb41a4d34494ecf70aefb9276e

am d65748bf: am 55f6bbf0: Merge "Move get_my_path_darwin to C++."

* commit 'd65748bfce43ad3524ef585bf99a2a9b64c06b7c':
  Move get_my_path_darwin to C++.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 3733ae3..8a99e6b 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -34,7 +34,7 @@
 
 LIBADB_darwin_SRC_FILES := \
     fdevent.cpp \
-    get_my_path_darwin.c \
+    get_my_path_darwin.cpp \
     usb_osx.c \
 
 LIBADB_linux_SRC_FILES := \

adb/get_my_path_darwin.cpp

diff --git a/adb/get_my_path_darwin.c b/adb/get_my_path_darwin.cpp
similarity index 100%
rename from adb/get_my_path_darwin.c
rename to adb/get_my_path_darwin.cpp