summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-06-09 22:38:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-09 22:38:45 +0000
commitc99720d29f2ee618cc74c9336d2cd2a26544c020 (patch)
tree1a58e5b3240749056b49c1db8159c47389a3ce15
parentb99e2e0c6dbea41591aa9ecd8ecd4f9737d51b52 (diff)
parent0a3edf7907ec2e91b6b3a64f46fb55c7c00a01c4 (diff)
downloadexternal_parameter-framework-c99720d29f2ee618cc74c9336d2cd2a26544c020.zip
external_parameter-framework-c99720d29f2ee618cc74c9336d2cd2a26544c020.tar.gz
external_parameter-framework-c99720d29f2ee618cc74c9336d2cd2a26544c020.tar.bz2
Merge "Exclude from Mac build." into mnc-dev
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index f5f1064..fd6d109 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
# Recursive call sub-folder Android.mk
#
-
+ifeq ($(HOST_OS),linux)
include $(call all-subdir-makefiles)
-
+endif