summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-10-07 17:50:09 +0000
committerAndreas Gampe <agampe@google.com>2015-10-07 17:50:09 +0000
commit7364dba71a9cd1c6cfd11945df67654ddc08582d (patch)
tree743e40a10091c5134e19eb6e3ee4b100acdd6fec
parent175805bbb161cdd271e4f851de69eaf08f846399 (diff)
downloadparameter-framework-7364dba71a9cd1c6cfd11945df67654ddc08582d.tar.gz
Revert "Temporarily disable due to python-related build issues"
This reverts commit 175805bbb161cdd271e4f851de69eaf08f846399. Seems the merger was blocked, all the underlying changes are now in. Change-Id: I92802dde26f868caa757247c055ec40557606798
-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)