| commit | f507a540d8afe1c4b42ea3c296a0b52329fed233 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Jan 24 00:57:06 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jan 24 00:57:06 2014 +0000 |
| tree | e1773cb88156b791a7e2815550ba00483f658d89 | |
| parent | 3f8230828f4035598004eee76aad0d0f5dd5166d [diff] | |
| parent | 62277146f800a533e4dbfe2305085fc2ba74a458 [diff] |
Merge "Revert "Temporarily disable mclinker (since nothing depends on it).""
diff --git a/Android.mk b/Android.mk index 3f1f54d..79c6d5b 100644 --- a/Android.mk +++ b/Android.mk
@@ -1,4 +1,3 @@ -ifeq (0,1) LOCAL_PATH := $(call my-dir) MCLD_ROOT_PATH := $(LOCAL_PATH) # For mcld.mk @@ -36,4 +35,3 @@ include $(MCLD_ROOT_PATH)/mcld.mk include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, $(subdirs))) -endif