summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-10-07 17:56:13 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-10-07 17:56:13 +0000
commit3ce2454cf75499317caf0c2b19ea0787a1c0af4a (patch)
tree5d9fc4b3549a6f1064778333f67035e6be8d5d5c
parentbcdbd1e75ff2294167b849df3287ac02cbb70f6a (diff)
parent7364dba71a9cd1c6cfd11945df67654ddc08582d (diff)
downloadparameter-framework-3ce2454cf75499317caf0c2b19ea0787a1c0af4a.tar.gz
Merge "Revert "Temporarily disable due to python-related build issues""
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 922ad84..60fb3bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,6 @@ endif
# Recursive call sub-folder Android.mk
#
-# currently disabled due to python-related build issues
-#include $(call all-subdir-makefiles)
+
+include $(call all-subdir-makefiles)