Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk
index 3682766..54a64a3 100644
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@ -57,6 +57,7 @@
HOST_RUN_RANLIB_AFTER_COPYING := false
else
HOST_RUN_RANLIB_AFTER_COPYING := true
+ PRE_LION_DYNAMIC_LINKER_OPTIONS := -Wl,-dynamic
endif
HOST_GLOBAL_ARFLAGS := cqs
@@ -82,7 +83,7 @@
define transform-host-o-to-executable-inner
$(hide) $(PRIVATE_CXX) \
-o $@ \
- -Wl,-dynamic -headerpad_max_install_names \
+ $(PRE_LION_DYNAMIC_LINKER_OPTIONS) -headerpad_max_install_names \
$(HOST_GLOBAL_LD_DIRS) \
$(HOST_GLOBAL_LDFLAGS) \
$(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
diff --git a/envsetup.sh b/envsetup.sh
index 26784ad..8fe6433 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -658,6 +658,17 @@
fi
}
+function hmm()
+{
+cat <<EOF
+- m: Makes from the top of the tree.
+- mm: Builds all of the modules in the current directory.
+- mmm dir: Same as 'cd dir; mm'
+
+Type 'help' for more commands.
+EOF
+}
+
function croot()
{
T=$(gettop)