Merge "Add -static to static link command, for clang."
diff --git a/core/binary.mk b/core/binary.mk
index d020846..224f328 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -840,11 +840,12 @@
$(call intermediates-dir-for,SHARED_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX))/export_includes) \
$(foreach l, $(my_static_libraries) $(my_whole_static_libraries), \
$(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX))/export_includes))
-$(import_includes) : $(import_includes_deps)
+$(import_includes): PRIVATE_IMPORT_EXPORT_INCLUDES := $(import_includes_deps)
+$(import_includes) : $(LOCAL_MODULE_MAKEFILE) $(import_includes_deps)
@echo Import includes file: $@
$(hide) mkdir -p $(dir $@) && rm -f $@
ifdef import_includes_deps
- $(hide) for f in $^; do \
+ $(hide) for f in $(PRIVATE_IMPORT_EXPORT_INCLUDES); do \
cat $$f >> $@; \
done
else
diff --git a/envsetup.sh b/envsetup.sh
index b6b62ea..45c4067 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1041,11 +1041,18 @@
if [ -z "$PID" ]; then
echo "Error: couldn't resolve pid by process name: $PROCESS_NAME"
return -4
+ else
+ echo "Resolved pid for $PROCESS_NAME is $PID"
fi
fi
local EXE=`adb shell readlink /proc/$PID/exe | sed s/.$//`
- # TODO: print error in case there is no such pid
+
+ if [ -z "$EXE" ]; then
+ echo "Error: no such pid=$PID - is process still alive?"
+ return -4
+ fi
+
local LOCAL_EXE_PATH=$SYMBOLS_DIR$EXE
if [ ! -f $LOCAL_EXE_PATH ]; then