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

Merge "Remove adb's unused get_my_path for Windows."

Browse source
This commit is contained in:
Elliott Hughes 2015-08-03 15:32:43 +00:00 • committed by Gerrit Code Review
commit 11ca81fc3c
2 changed files with 0 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
adb/Android.mk
View file

@ -67,7 +67,6 @@ LIBADB_linux_SRC_FILES := \
usb_linux.cpp \ usb_linux.cpp \
LIBADB_windows_SRC_FILES := \ LIBADB_windows_SRC_FILES := \
get_my_path_windows.cpp \
sysdeps_win32.cpp \ sysdeps_win32.cpp \
usb_windows.cpp \ usb_windows.cpp \

48
adb/get_my_path_windows.cpp
View file

@ -1,48 +0,0 @@
/*
* Copyright (C) 2007 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "sysdeps.h"
#include <assert.h>
#include <limits.h>
#include <windows.h>
#include <base/macros.h>
#include "adb.h"
// This is not currently called on Windows. Code that only runs on Windows
// should probably deal with UTF-16 WCHAR/wchar_t since Windows APIs natively
// work in that format.
void get_my_path(char *exe, size_t maxLen) {
WCHAR wexe[MAX_PATH];
DWORD module_result = GetModuleFileNameW(NULL, wexe, arraysize(wexe));
if ((module_result == arraysize(wexe)) || (module_result == 0)) {
// String truncation or other error.
wexe[0] = '\0';
}
// Convert from UTF-16 to UTF-8.
const std::string exe_str(narrow(wexe));
if (exe_str.length() + 1 <= maxLen) {
strcpy(exe, exe_str.c_str());
} else {
exe[0] = '\0';
}
}