Added libunwind as shared as well
diff --git a/heron/executor/src/python/heron_executor.py b/heron/executor/src/python/heron_executor.py
index d8acd22..d4ec61f 100755
--- a/heron/executor/src/python/heron_executor.py
+++ b/heron/executor/src/python/heron_executor.py
@@ -123,12 +123,14 @@
def set_ld_library_paths(env):
if "LD_LIBRARY_PATH" in env:
env["LD_LIBRARY_PATH"] = env["LD_LIBRARY_PATH"] + ":./heron-core/lib/glog/"
+ env["LD_LIBRARY_PATH"] = env["LD_LIBRARY_PATH"] + ":./heron-core/lib/libunwind/"
else:
- env["LD_LIBRARY_PATH"] = "./heron-core/lib/glog/"
+ env["LD_LIBRARY_PATH"] = "./heron-core/lib/glog/:./heron-core/lib/libunwind/"
if "DYLD_LIBRARY_PATH" in env:
env["DYLD_LIBRARY_PATH"] = env["DYLD_LIBRARY_PATH"] + ":./heron-core/lib/glog/"
+ env["DYLD_LIBRARY_PATH"] = env["DYLD_LIBRARY_PATH"] + ":./heron-core/lib/libunwind/"
else:
- env["DYLD_LIBRARY_PATH"] = "./heron-core/lib/glog/"
+ env["DYLD_LIBRARY_PATH"] = "./heron-core/lib/glog/:./heron-core/lib/libunwind/"
class ProcessInfo(object):
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
index 3a14b39..6bcc8e7 100644
--- a/scripts/packages/BUILD
+++ b/scripts/packages/BUILD
@@ -18,6 +18,7 @@
load("/tools/rules/heron_core", "heron_core_bin_files")
load("/tools/rules/heron_core", "heron_core_conf_files")
load("/tools/rules/heron_core", "heron_core_lib_glog_files")
+load("/tools/rules/heron_core", "heron_core_lib_libunwind_files")
load("/tools/rules/heron_core", "heron_core_lib_instance_files")
load("/tools/rules/heron_core", "heron_core_lib_healthmgr_files")
load("/tools/rules/heron_core", "heron_core_lib_metricsmgr_files")
@@ -91,6 +92,7 @@
deps = [
":heron-core-bin",
":heron-core-lib-glog",
+ ":heron-core-lib-libunwind",
":heron-core-lib-scheduler",
":heron-core-lib-packing",
":heron-core-lib-healthmgr",
@@ -117,6 +119,12 @@
)
pkg_tar(
+ name = "heron-core-lib-libunwind",
+ package_dir = "heron-core/lib/libunwind",
+ srcs = heron_core_lib_libunwind_files(),
+)
+
+pkg_tar(
name = "heron-core-lib-scheduler",
package_dir = "heron-core/lib/scheduler",
srcs = heron_core_lib_scheduler_files(),
diff --git a/tools/rules/heron_core.bzl b/tools/rules/heron_core.bzl
index 79a0d7d..858a17b 100644
--- a/tools/rules/heron_core.bzl
+++ b/tools/rules/heron_core.bzl
@@ -29,6 +29,7 @@
heron_core_lib_statemgr_files() + \
heron_core_lib_instance_files() + \
heron_core_lib_glog_files() + \
+ heron_core_lib_libunwind_files() + \
heron_core_lib_ckptmgr_files() + \
heron_core_lib_statefulstorage_files() + \
heron_core_lib_downloader_files()
@@ -59,6 +60,11 @@
"//third_party/glog:glog-dynamic-lib-files"
]
+def heron_core_lib_libunwind_files():
+ return [
+ "//third_party/libunwind:libunwind-dynamic-files"
+ ]
+
def heron_core_lib_metricsmgr_files():
return [
"//heron/metricsmgr/src/java:heron-metricsmgr",