diff options
| -rw-r--r-- | build/apex/ld.config.txt | 6 | ||||
| -rwxr-xr-x | tools/build_linux_bionic.sh | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/build/apex/ld.config.txt b/build/apex/ld.config.txt index 69e6543f75..014b1152c6 100644 --- a/build/apex/ld.config.txt +++ b/build/apex/ld.config.txt @@ -24,4 +24,8 @@ namespace.default.link.platform.allow_all_shared_libs = true namespace.platform.isolated = true namespace.platform.search.paths = /system/${LIB} namespace.platform.links = default -namespace.platform.link.default.shared_libs = libc.so:libdl.so:libm.so +namespace.platform.link.default.shared_libs = libc.so:libdl.so:libm.so +namespace.platform.link.default.shared_libs += libart.so:libartd.so +namespace.platform.link.default.shared_libs += libnativebridge.so +namespace.platform.link.default.shared_libs += libnativehelper.so +namespace.platform.link.default.shared_libs += libnativeloader.so diff --git a/tools/build_linux_bionic.sh b/tools/build_linux_bionic.sh index 94ccc41331..d3c19120ca 100755 --- a/tools/build_linux_bionic.sh +++ b/tools/build_linux_bionic.sh @@ -42,6 +42,7 @@ fi out_dir=$(get_build_var OUT_DIR) host_out=$(get_build_var HOST_OUT) +mk_product_out=$(get_build_var PRODUCT_OUT) # TODO(b/31559095) Figure out a better way to do this. # @@ -52,6 +53,12 @@ tmp_soong_var=$(mktemp --tmpdir soong.variables.bak.XXXXXX) cat $out_dir/soong/soong.variables > ${tmp_soong_var} build/soong/soong_ui.bash --make-mode clean mkdir -p $out_dir/soong +mkdir -p $mk_product_out + +# TODO(b/31559095) Soong will panic if this file isn't present. It contains +# information from MAKE needed to let soong handle the invocation of dex2oat. +# This would be great to have but for now isn't needed. +echo "{}" > $mk_product_out/dexpreopt.config python3 <<END - ${tmp_soong_var} ${out_dir}/soong/soong.variables import json |