diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-31 18:49:59 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-31 18:49:59 -0700 |
| commit | 3e1391d1a4bee9d29d5b35255aabfc22d7651e98 (patch) | |
| tree | c0de214ae4045e5724a15ca87a98152593e4b79b /simulator | |
| parent | e5ee8856ebca2667604c5074e1ecddd5b0d3ab5f (diff) | |
| download | android_development-3e1391d1a4bee9d29d5b35255aabfc22d7651e98.tar.gz android_development-3e1391d1a4bee9d29d5b35255aabfc22d7651e98.tar.bz2 android_development-3e1391d1a4bee9d29d5b35255aabfc22d7651e98.zip | |
get rid of utils/executablepath.h, which now lives in the simulator
Diffstat (limited to 'simulator')
| -rw-r--r-- | simulator/app/MyApp.cpp | 2 | ||||
| -rw-r--r-- | simulator/app/executablepath.h | 28 | ||||
| -rw-r--r-- | simulator/app/executablepath_darwin.cpp | 2 | ||||
| -rw-r--r-- | simulator/app/executablepath_linux.cpp | 2 |
4 files changed, 31 insertions, 3 deletions
diff --git a/simulator/app/MyApp.cpp b/simulator/app/MyApp.cpp index 313e44d80..fd610b18c 100644 --- a/simulator/app/MyApp.cpp +++ b/simulator/app/MyApp.cpp @@ -16,7 +16,7 @@ #include "MainFrame.h" #include "MyApp.h" -#include <utils/executablepath.h> +#include "executablepath.h" #include <stdio.h> #include <unistd.h> diff --git a/simulator/app/executablepath.h b/simulator/app/executablepath.h new file mode 100644 index 000000000..889982d68 --- /dev/null +++ b/simulator/app/executablepath.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2008 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. + */ + +#ifndef _SIM_EXECUTABLEPATH_H +#define _SIM_EXECUTABLEPATH_H + +#include <limits.h> + +// returns the path to this executable +#if __cplusplus +extern "C" +#endif +void executablepath(char s[PATH_MAX]); + +#endif // _SIM_EXECUTABLEPATH_H diff --git a/simulator/app/executablepath_darwin.cpp b/simulator/app/executablepath_darwin.cpp index 2e3c3a01f..9ec1c183e 100644 --- a/simulator/app/executablepath_darwin.cpp +++ b/simulator/app/executablepath_darwin.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <utils/executablepath.h> +#include "executablepath.h" #import <Carbon/Carbon.h> #include <unistd.h> diff --git a/simulator/app/executablepath_linux.cpp b/simulator/app/executablepath_linux.cpp index b8d2a3d6f..e4a3a2b8e 100644 --- a/simulator/app/executablepath_linux.cpp +++ b/simulator/app/executablepath_linux.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <utils/executablepath.h> +#include "executablepath.h" #include <sys/types.h> #include <unistd.h> #include <limits.h> |