diff options
author | Jon Medhurst <tixy@linaro.org> | 2015-09-24 12:30:38 -0700 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2015-09-24 12:30:38 -0700 |
commit | bb48cf8051f8e57ac773bb2ba61b5ad2bb129a50 (patch) | |
tree | bb65021279c190848e1ca669ffd5a188db0f08a5 | |
parent | 63bde858d295c158b525046c6ba45af61299d41e (diff) | |
parent | 55121f8718726e77c4630dc172ab267076e6738c (diff) |
Merge branch 'linaro' into android5.22-linaro-androidandroid
-rw-r--r-- | daemon/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/Android.mk b/daemon/Android.mk index 9934211..527b1db 100644 --- a/daemon/Android.mk +++ b/daemon/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) # Don't use this file if GATOR_DAEMON_PATH is set and we're not under that path -ifneq ($(and $(GATOR_DAEMON_PATH),$(filter $(patsubst %/,%,$(GATOR_DAEMON_PATH))/%,$(LOCAL_PATH)/)),) +ifneq ($(if $(GATOR_DAEMON_PATH),$(filter $(patsubst %/,%,$(GATOR_DAEMON_PATH))/%,$(LOCAL_PATH)/),else-ok),) include $(CLEAR_VARS) |