aboutsummaryrefslogtreecommitdiffstats
path: root/func.cc
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-07-02 02:59:55 +0900
committerShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-07-03 14:17:45 +0900
commit4e950e6f4e4d0204412550b2a67be7c231018eb8 (patch)
tree9d158a8014ae35dde1bf3e1f91f0ccc18a86c659 /func.cc
parent9c874e69e3319c3b91473c201747c420917d2b6a (diff)
downloadandroid_build_kati-4e950e6f4e4d0204412550b2a67be7c231018eb8.tar.gz
android_build_kati-4e950e6f4e4d0204412550b2a67be7c231018eb8.tar.bz2
android_build_kati-4e950e6f4e4d0204412550b2a67be7c231018eb8.zip
[C++] Make FindEmulator optional
Diffstat (limited to 'func.cc')
-rw-r--r--func.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/func.cc b/func.cc
index 9309ed3..34e471b 100644
--- a/func.cc
+++ b/func.cc
@@ -486,11 +486,11 @@ void ShellFunc(const vector<Value*>& args, Evaluator* ev, string* s) {
#ifdef TEST_FIND_EMULATOR
bool need_check = false;
string out2;
- if (FindEmulator::Get()->HandleFind(*cmd, &out2)) {
+ if (FindEmulator::Get() && FindEmulator::Get()->HandleFind(*cmd, &out2)) {
need_check = true;
}
#else
- if (FindEmulator::Get()->HandleFind(*cmd, s))
+ if (FindEmulator::Get() && FindEmulator::Get()->HandleFind(*cmd, s))
return;
#endif