diff options
| author | 2015-07-29 14:35:18 -0700 | |
|---|---|---|
| committer | 2015-07-29 14:35:18 -0700 | |
| commit | 9ec96f97567bc86deebe073d5c828a6477b9a785 (patch) | |
| tree | 0a3a9e0f94a3ab665d5cc4865c000094b7703d9c | |
| parent | 7d71d88c6d305d6ed19b320944f4ce644db82240 (diff) | |
Move frameworks/base/tools/ off AndroidConfig.h.
Change-Id: Ibc7abb67a56945a9618bc91ccdbebe4c806879a5
| -rw-r--r-- | tools/aapt/CrunchCache.cpp | 1 | ||||
| -rw-r--r-- | tools/aapt/Main.cpp | 1 | ||||
| -rw-r--r-- | tools/aidl/aidl.cpp | 1 | ||||
| -rw-r--r-- | tools/aidl/os.h | 26 | ||||
| -rw-r--r-- | tools/aidl/search_path.cpp | 1 |
5 files changed, 30 insertions, 0 deletions
diff --git a/tools/aapt/CrunchCache.cpp b/tools/aapt/CrunchCache.cpp index 6c39d1d7753c..0d574cf127dd 100644 --- a/tools/aapt/CrunchCache.cpp +++ b/tools/aapt/CrunchCache.cpp @@ -5,6 +5,7 @@ // This file defines functions laid out and documented in // CrunchCache.h +#include <utils/Compat.h> #include <utils/Vector.h> #include <utils/String8.h> diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp index 8b416aa82fdb..eeee2fa5f9da 100644 --- a/tools/aapt/Main.cpp +++ b/tools/aapt/Main.cpp @@ -6,6 +6,7 @@ #include "Main.h" #include "Bundle.h" +#include <utils/Compat.h> #include <utils/Log.h> #include <utils/threads.h> #include <utils/List.h> diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp index ff08b67fe234..368e73d05f18 100644 --- a/tools/aidl/aidl.cpp +++ b/tools/aidl/aidl.cpp @@ -1,6 +1,7 @@ #include "aidl_language.h" #include "options.h" +#include "os.h" #include "search_path.h" #include "Type.h" #include "generate_java.h" diff --git a/tools/aidl/os.h b/tools/aidl/os.h new file mode 100644 index 000000000000..79d2c35eea3d --- /dev/null +++ b/tools/aidl/os.h @@ -0,0 +1,26 @@ +/* + * Copyright 2015, 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 _FRAMEWORKS_BASE_TOOLS_AIDL_OS_SEP_H_ +#define _FRAMEWORKS_BASE_TOOLS_AIDL_OS_SEP_H_ + +#if defined(_WIN32) +#define OS_PATH_SEPARATOR '\\' +#else +#define OS_PATH_SEPARATOR '/' +#endif + +#endif diff --git a/tools/aidl/search_path.cpp b/tools/aidl/search_path.cpp index ffb6cb2932e4..29dbe260c4f1 100644 --- a/tools/aidl/search_path.cpp +++ b/tools/aidl/search_path.cpp @@ -1,6 +1,7 @@ #include <unistd.h> #include "search_path.h" #include "options.h" +#include "os.h" #include <string.h> #ifdef HAVE_MS_C_RUNTIME |