commit 549154d16f570aeb41a4d34494ecf70aefb9276e
author Elliott Hughes <enh@google.com> Thu Apr 16 20:37:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 20:37:44 2015 +0000
tree de3cc69d084ec3cb5366b8afb57af798823954ca
parent 55f7d14c294d10042095c6e8f76c74ada42f7d3d
parent 5c10d1c8b275cb487b038d0bd59b5ee346a4534a

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

* commit '55f6bbf06ade70f7b7ac9aaf4b51b2fcfa7d8368':
  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