From befe542e92e6dd995b9de55850545e2986858199 Mon Sep 17 00:00:00 2001 From: Chris Watts Date: Fri, 28 May 2021 16:26:07 +0100 Subject: [PATCH] Reworked scripts for improved reliability and utility --- .../local/Inst => }/bin/callgrind_annotate | 0 .../local/Inst => }/bin/callgrind_control | 0 Inst/{data/local/Inst => }/bin/cg_annotate | 0 Inst/{data/local/Inst => }/bin/cg_diff | 0 Inst/{data/local/Inst => }/bin/cg_merge | Bin Inst/{data/local/Inst => }/bin/ms_print | 0 Inst/{data/local/Inst => }/bin/valgrind | Bin .../local/Inst => }/bin/valgrind-di-server | Bin .../local/Inst => }/bin/valgrind-listener | Bin Inst/{data/local/Inst => }/bin/vgdb | Bin .../Inst => }/include/valgrind/callgrind.h | 0 .../local/Inst => }/include/valgrind/config.h | 0 .../local/Inst => }/include/valgrind/drd.h | 0 .../Inst => }/include/valgrind/helgrind.h | 0 .../local/Inst => }/include/valgrind/libvex.h | 0 .../include/valgrind/libvex_basictypes.h | 0 .../include/valgrind/libvex_emnote.h | 0 .../include/valgrind/libvex_guest_amd64.h | 0 .../include/valgrind/libvex_guest_arm.h | 0 .../include/valgrind/libvex_guest_arm64.h | 0 .../include/valgrind/libvex_guest_mips32.h | 0 .../include/valgrind/libvex_guest_mips64.h | 0 .../include/valgrind/libvex_guest_offsets.h | 0 .../include/valgrind/libvex_guest_ppc32.h | 0 .../include/valgrind/libvex_guest_ppc64.h | 0 .../include/valgrind/libvex_guest_s390x.h | 0 .../include/valgrind/libvex_guest_x86.h | 0 .../Inst => }/include/valgrind/libvex_ir.h | 0 .../include/valgrind/libvex_s390x_common.h | 0 .../include/valgrind/libvex_trc_values.h | 0 .../Inst => }/include/valgrind/memcheck.h | 0 .../include/valgrind/pub_tool_addrinfo.h | 0 .../include/valgrind/pub_tool_aspacehl.h | 0 .../include/valgrind/pub_tool_aspacemgr.h | 0 .../include/valgrind/pub_tool_basics.h | 0 .../include/valgrind/pub_tool_basics_asm.h | 0 .../include/valgrind/pub_tool_clientstate.h | 0 .../include/valgrind/pub_tool_clreq.h | 0 .../include/valgrind/pub_tool_debuginfo.h | 0 .../valgrind/pub_tool_deduppoolalloc.h | 0 .../include/valgrind/pub_tool_errormgr.h | 0 .../include/valgrind/pub_tool_execontext.h | 0 .../include/valgrind/pub_tool_gdbserver.h | 0 .../include/valgrind/pub_tool_hashtable.h | 0 .../include/valgrind/pub_tool_libcassert.h | 0 .../include/valgrind/pub_tool_libcbase.h | 0 .../include/valgrind/pub_tool_libcfile.h | 0 .../include/valgrind/pub_tool_libcprint.h | 0 .../include/valgrind/pub_tool_libcproc.h | 0 .../include/valgrind/pub_tool_libcsetjmp.h | 0 .../include/valgrind/pub_tool_libcsignal.h | 0 .../include/valgrind/pub_tool_machine.h | 0 .../include/valgrind/pub_tool_mallocfree.h | 0 .../include/valgrind/pub_tool_options.h | 0 .../include/valgrind/pub_tool_oset.h | 0 .../include/valgrind/pub_tool_poolalloc.h | 0 .../include/valgrind/pub_tool_rangemap.h | 0 .../include/valgrind/pub_tool_redir.h | 0 .../include/valgrind/pub_tool_replacemalloc.h | 0 .../include/valgrind/pub_tool_seqmatch.h | 0 .../include/valgrind/pub_tool_signals.h | 0 .../include/valgrind/pub_tool_sparsewa.h | 0 .../include/valgrind/pub_tool_stacktrace.h | 0 .../include/valgrind/pub_tool_threadstate.h | 0 .../include/valgrind/pub_tool_tooliface.h | 0 .../Inst => }/include/valgrind/pub_tool_vki.h | 0 .../include/valgrind/pub_tool_vkiscnums.h | 0 .../include/valgrind/pub_tool_vkiscnums_asm.h | 0 .../include/valgrind/pub_tool_wordfm.h | 0 .../include/valgrind/pub_tool_xarray.h | 0 .../Inst => }/include/valgrind/valgrind.h | 0 .../include/valgrind/vki/vki-amd64-linux.h | 0 .../include/valgrind/vki/vki-arm-linux.h | 0 .../include/valgrind/vki/vki-arm64-linux.h | 0 .../include/valgrind/vki/vki-darwin.h | 0 .../include/valgrind/vki/vki-linux-drm.h | 0 .../include/valgrind/vki/vki-linux.h | 0 .../include/valgrind/vki/vki-mips32-linux.h | 0 .../include/valgrind/vki/vki-mips64-linux.h | 0 .../valgrind/vki/vki-posixtypes-amd64-linux.h | 0 .../valgrind/vki/vki-posixtypes-arm-linux.h | 0 .../valgrind/vki/vki-posixtypes-arm64-linux.h | 0 .../vki/vki-posixtypes-mips32-linux.h | 0 .../vki/vki-posixtypes-mips64-linux.h | 0 .../valgrind/vki/vki-posixtypes-ppc32-linux.h | 0 .../valgrind/vki/vki-posixtypes-ppc64-linux.h | 0 .../valgrind/vki/vki-posixtypes-s390x-linux.h | 0 .../valgrind/vki/vki-posixtypes-x86-linux.h | 0 .../include/valgrind/vki/vki-ppc32-linux.h | 0 .../include/valgrind/vki/vki-ppc64-linux.h | 0 .../include/valgrind/vki/vki-s390x-linux.h | 0 .../valgrind/vki/vki-scnums-amd64-linux.h | 0 .../valgrind/vki/vki-scnums-arm-linux.h | 0 .../valgrind/vki/vki-scnums-arm64-linux.h | 0 .../include/valgrind/vki/vki-scnums-darwin.h | 0 .../valgrind/vki/vki-scnums-mips32-linux.h | 0 .../valgrind/vki/vki-scnums-mips64-linux.h | 0 .../valgrind/vki/vki-scnums-ppc32-linux.h | 0 .../valgrind/vki/vki-scnums-ppc64-linux.h | 0 .../valgrind/vki/vki-scnums-s390x-linux.h | 0 .../valgrind/vki/vki-scnums-x86-linux.h | 0 .../include/valgrind/vki/vki-x86-linux.h | 0 .../include/valgrind/vki/vki-xen-domctl.h | 0 .../include/valgrind/vki/vki-xen-evtchn.h | 0 .../include/valgrind/vki/vki-xen-gnttab.h | 0 .../include/valgrind/vki/vki-xen-hvm.h | 0 .../include/valgrind/vki/vki-xen-memory.h | 0 .../include/valgrind/vki/vki-xen-mmuext.h | 0 .../include/valgrind/vki/vki-xen-sysctl.h | 0 .../include/valgrind/vki/vki-xen-tmem.h | 0 .../include/valgrind/vki/vki-xen-version.h | 0 .../include/valgrind/vki/vki-xen-x86.h | 0 .../Inst => }/include/valgrind/vki/vki-xen.h | 0 .../local/Inst => }/lib/pkgconfig/valgrind.pc | 0 .../lib/valgrind/32bit-core-valgrind-s1.xml | 0 .../lib/valgrind/32bit-core-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/32bit-core.xml | 0 .../lib/valgrind/32bit-linux-valgrind-s1.xml | 0 .../lib/valgrind/32bit-linux-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/32bit-linux.xml | 0 .../lib/valgrind/32bit-sse-valgrind-s1.xml | 0 .../lib/valgrind/32bit-sse-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/32bit-sse.xml | 0 .../lib/valgrind/64bit-avx-valgrind-s1.xml | 0 .../lib/valgrind/64bit-avx-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/64bit-avx.xml | 0 .../lib/valgrind/64bit-core-valgrind-s1.xml | 0 .../lib/valgrind/64bit-core-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/64bit-core.xml | 0 .../lib/valgrind/64bit-linux-valgrind-s1.xml | 0 .../lib/valgrind/64bit-linux-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/64bit-linux.xml | 0 .../lib/valgrind/64bit-sse-valgrind-s1.xml | 0 .../lib/valgrind/64bit-sse-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/64bit-sse.xml | 0 .../valgrind/amd64-avx-coresse-valgrind.xml | 0 .../lib/valgrind/amd64-avx-coresse.xml | 0 .../lib/valgrind/amd64-avx-linux-valgrind.xml | 0 .../lib/valgrind/amd64-avx-linux.xml | 0 .../lib/valgrind/amd64-coresse-valgrind.xml | 0 .../lib/valgrind/amd64-linux-valgrind.xml | 0 .../lib/valgrind/arm-core-valgrind-s1.xml | 0 .../lib/valgrind/arm-core-valgrind-s2.xml | 0 .../local/Inst => }/lib/valgrind/arm-core.xml | 0 .../lib/valgrind/arm-vfpv3-valgrind-s1.xml | 0 .../lib/valgrind/arm-vfpv3-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/arm-vfpv3.xml | 0 .../lib/valgrind/arm-with-vfpv3-valgrind.xml | 0 .../Inst => }/lib/valgrind/arm-with-vfpv3.xml | 0 .../lib/valgrind/cachegrind-arm-linux | Bin .../lib/valgrind/callgrind-arm-linux | Bin .../local/Inst => }/lib/valgrind/default.supp | 0 .../Inst => }/lib/valgrind/drd-arm-linux | Bin .../Inst => }/lib/valgrind/exp-bbv-arm-linux | Bin .../Inst => }/lib/valgrind/exp-dhat-arm-linux | Bin .../lib/valgrind/exp-sgcheck-arm-linux | Bin .../Inst => }/lib/valgrind/getoff-arm-linux | Bin .../Inst => }/lib/valgrind/helgrind-arm-linux | Bin .../lib/valgrind/i386-coresse-valgrind.xml | 0 .../lib/valgrind/i386-linux-valgrind.xml | 0 .../Inst => }/lib/valgrind/lackey-arm-linux | Bin .../lib/valgrind/libcoregrind-arm-linux.a | Bin .../libreplacemalloc_toolpreload-arm-linux.a | Bin .../Inst => }/lib/valgrind/libvex-arm-linux.a | Bin .../Inst => }/lib/valgrind/massif-arm-linux | Bin .../Inst => }/lib/valgrind/memcheck-arm-linux | Bin .../lib/valgrind/mips-cp0-valgrind-s1.xml | 0 .../lib/valgrind/mips-cp0-valgrind-s2.xml | 0 .../local/Inst => }/lib/valgrind/mips-cp0.xml | 0 .../lib/valgrind/mips-cpu-valgrind-s1.xml | 0 .../lib/valgrind/mips-cpu-valgrind-s2.xml | 0 .../local/Inst => }/lib/valgrind/mips-cpu.xml | 0 .../lib/valgrind/mips-fpu-valgrind-s1.xml | 0 .../lib/valgrind/mips-fpu-valgrind-s2.xml | 0 .../local/Inst => }/lib/valgrind/mips-fpu.xml | 0 .../lib/valgrind/mips-linux-valgrind.xml | 0 .../Inst => }/lib/valgrind/mips-linux.xml | 0 .../lib/valgrind/mips64-cp0-valgrind-s1.xml | 0 .../lib/valgrind/mips64-cp0-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/mips64-cp0.xml | 0 .../lib/valgrind/mips64-cpu-valgrind-s1.xml | 0 .../lib/valgrind/mips64-cpu-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/mips64-cpu.xml | 0 .../lib/valgrind/mips64-fpu-valgrind-s1.xml | 0 .../lib/valgrind/mips64-fpu-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/mips64-fpu.xml | 0 .../lib/valgrind/mips64-linux-valgrind.xml | 0 .../Inst => }/lib/valgrind/mips64-linux.xml | 0 .../Inst => }/lib/valgrind/none-arm-linux | Bin .../valgrind/power-altivec-valgrind-s1.xml | 0 .../valgrind/power-altivec-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/power-altivec.xml | 0 .../lib/valgrind/power-core-valgrind-s1.xml | 0 .../lib/valgrind/power-core-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/power-core.xml | 0 .../lib/valgrind/power-fpu-valgrind-s1.xml | 0 .../lib/valgrind/power-fpu-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/power-fpu.xml | 0 .../lib/valgrind/power-linux-valgrind-s1.xml | 0 .../lib/valgrind/power-linux-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/power-linux.xml | 0 .../lib/valgrind/power64-core-valgrind-s1.xml | 0 .../lib/valgrind/power64-core-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/power64-core.xml | 0 .../valgrind/power64-linux-valgrind-s1.xml | 0 .../valgrind/power64-linux-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/power64-linux.xml | 0 .../valgrind/powerpc-altivec32l-valgrind.xml | 0 .../lib/valgrind/powerpc-altivec32l.xml | 0 .../valgrind/powerpc-altivec64l-valgrind.xml | 0 .../lib/valgrind/powerpc-altivec64l.xml | 0 .../lib/valgrind/s390-acr-valgrind-s1.xml | 0 .../lib/valgrind/s390-acr-valgrind-s2.xml | 0 .../local/Inst => }/lib/valgrind/s390-acr.xml | 0 .../lib/valgrind/s390-fpr-valgrind-s1.xml | 0 .../lib/valgrind/s390-fpr-valgrind-s2.xml | 0 .../local/Inst => }/lib/valgrind/s390-fpr.xml | 0 .../lib/valgrind/s390x-core64-valgrind-s1.xml | 0 .../lib/valgrind/s390x-core64-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/s390x-core64.xml | 0 .../lib/valgrind/s390x-generic-valgrind.xml | 0 .../Inst => }/lib/valgrind/s390x-generic.xml | 0 .../valgrind/s390x-linux64-valgrind-s1.xml | 0 .../valgrind/s390x-linux64-valgrind-s2.xml | 0 .../Inst => }/lib/valgrind/s390x-linux64.xml | 0 .../lib/valgrind/vgpreload_core-arm-linux.so | Bin .../lib/valgrind/vgpreload_drd-arm-linux.so | Bin .../valgrind/vgpreload_exp-dhat-arm-linux.so | Bin .../vgpreload_exp-sgcheck-arm-linux.so | Bin .../valgrind/vgpreload_helgrind-arm-linux.so | Bin .../valgrind/vgpreload_massif-arm-linux.so | Bin .../valgrind/vgpreload_memcheck-arm-linux.so | Bin .../share/doc/valgrind/html/FAQ.html | 0 .../share/doc/valgrind/html/QuickStart.html | 0 .../share/doc/valgrind/html/bbv-manual.html | 0 .../share/doc/valgrind/html/cg-manual.html | 0 .../share/doc/valgrind/html/cl-format.html | 0 .../share/doc/valgrind/html/cl-manual.html | 0 .../share/doc/valgrind/html/design-impl.html | 0 .../share/doc/valgrind/html/dh-manual.html | 0 .../share/doc/valgrind/html/dist.authors.html | 0 .../share/doc/valgrind/html/dist.html | 0 .../share/doc/valgrind/html/dist.news.html | 0 .../doc/valgrind/html/dist.news.old.html | 0 .../valgrind/html/dist.readme-android.html | 0 .../html/dist.readme-android_emulator.html | 0 .../valgrind/html/dist.readme-developers.html | 0 .../doc/valgrind/html/dist.readme-mips.html | 0 .../valgrind/html/dist.readme-missing.html | 0 .../valgrind/html/dist.readme-packagers.html | 0 .../doc/valgrind/html/dist.readme-s390.html | 0 .../share/doc/valgrind/html/dist.readme.html | 0 .../share/doc/valgrind/html/drd-manual.html | 0 .../share/doc/valgrind/html/faq.html | 0 .../share/doc/valgrind/html/hg-manual.html | 0 .../share/doc/valgrind/html/images/home.png | Bin .../share/doc/valgrind/html/images/next.png | Bin .../share/doc/valgrind/html/images/prev.png | Bin .../share/doc/valgrind/html/images/up.png | Bin .../share/doc/valgrind/html/index.html | 0 .../share/doc/valgrind/html/license.gfdl.html | 0 .../share/doc/valgrind/html/license.gpl.html | 0 .../share/doc/valgrind/html/licenses.html | 0 .../share/doc/valgrind/html/lk-manual.html | 0 .../doc/valgrind/html/manual-core-adv.html | 0 .../share/doc/valgrind/html/manual-core.html | 0 .../share/doc/valgrind/html/manual-intro.html | 0 .../valgrind/html/manual-writing-tools.html | 0 .../share/doc/valgrind/html/manual.html | 0 .../share/doc/valgrind/html/mc-manual.html | 0 .../share/doc/valgrind/html/ms-manual.html | 0 .../share/doc/valgrind/html/nl-manual.html | 0 .../share/doc/valgrind/html/quick-start.html | 0 .../share/doc/valgrind/html/sg-manual.html | 0 .../share/doc/valgrind/html/tech-docs.html | 0 .../share/doc/valgrind/html/vg_basic.css | 0 .../share/doc/valgrind/valgrind_manual.pdf | Bin .../share/doc/valgrind/valgrind_manual.ps | Bin .../share/man/man1/callgrind_annotate.1 | 0 .../share/man/man1/callgrind_control.1 | 0 .../Inst => }/share/man/man1/cg_annotate.1 | 0 .../local/Inst => }/share/man/man1/cg_diff.1 | 0 .../local/Inst => }/share/man/man1/cg_merge.1 | 0 .../local/Inst => }/share/man/man1/ms_print.1 | 0 .../share/man/man1/valgrind-listener.1 | 0 .../local/Inst => }/share/man/man1/valgrind.1 | 0 .../local/Inst => }/share/man/man1/vgdb.1 | 0 README.md | 26 ++-- bootstrap_valgrind.sh | 19 --- install_android_valgrind.sh | 26 ++-- start_valgrind.sh | 118 +++++++++++++++--- valgrind_wrapper.template.sh | 19 +++ 292 files changed, 143 insertions(+), 65 deletions(-) rename Inst/{data/local/Inst => }/bin/callgrind_annotate (100%) rename Inst/{data/local/Inst => }/bin/callgrind_control (100%) rename Inst/{data/local/Inst => }/bin/cg_annotate (100%) rename Inst/{data/local/Inst => }/bin/cg_diff (100%) rename Inst/{data/local/Inst => }/bin/cg_merge (100%) rename Inst/{data/local/Inst => }/bin/ms_print (100%) rename Inst/{data/local/Inst => }/bin/valgrind (100%) rename Inst/{data/local/Inst => }/bin/valgrind-di-server (100%) rename Inst/{data/local/Inst => }/bin/valgrind-listener (100%) rename Inst/{data/local/Inst => }/bin/vgdb (100%) rename Inst/{data/local/Inst => }/include/valgrind/callgrind.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/config.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/drd.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/helgrind.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_basictypes.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_emnote.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_amd64.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_arm.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_arm64.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_mips32.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_mips64.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_offsets.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_ppc32.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_ppc64.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_s390x.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_guest_x86.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_ir.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_s390x_common.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/libvex_trc_values.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/memcheck.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_addrinfo.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_aspacehl.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_aspacemgr.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_basics.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_basics_asm.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_clientstate.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_clreq.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_debuginfo.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_deduppoolalloc.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_errormgr.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_execontext.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_gdbserver.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_hashtable.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_libcassert.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_libcbase.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_libcfile.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_libcprint.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_libcproc.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_libcsetjmp.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_libcsignal.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_machine.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_mallocfree.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_options.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_oset.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_poolalloc.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_rangemap.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_redir.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_replacemalloc.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_seqmatch.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_signals.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_sparsewa.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_stacktrace.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_threadstate.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_tooliface.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_vki.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_vkiscnums.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_vkiscnums_asm.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_wordfm.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/pub_tool_xarray.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/valgrind.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-amd64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-arm-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-arm64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-darwin.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-linux-drm.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-mips32-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-mips64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-posixtypes-amd64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-posixtypes-arm-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-posixtypes-arm64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-posixtypes-mips32-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-posixtypes-mips64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-posixtypes-ppc32-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-posixtypes-ppc64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-posixtypes-s390x-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-posixtypes-x86-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-ppc32-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-ppc64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-s390x-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-amd64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-arm-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-arm64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-darwin.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-mips32-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-mips64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-ppc32-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-ppc64-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-s390x-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-scnums-x86-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-x86-linux.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-domctl.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-evtchn.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-gnttab.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-hvm.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-memory.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-mmuext.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-sysctl.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-tmem.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-version.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen-x86.h (100%) rename Inst/{data/local/Inst => }/include/valgrind/vki/vki-xen.h (100%) rename Inst/{data/local/Inst => }/lib/pkgconfig/valgrind.pc (100%) rename Inst/{data/local/Inst => }/lib/valgrind/32bit-core-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/32bit-core-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/32bit-core.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/32bit-linux-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/32bit-linux-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/32bit-linux.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/32bit-sse-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/32bit-sse-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/32bit-sse.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-avx-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-avx-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-avx.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-core-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-core-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-core.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-linux-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-linux-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-linux.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-sse-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-sse-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/64bit-sse.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/amd64-avx-coresse-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/amd64-avx-coresse.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/amd64-avx-linux-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/amd64-avx-linux.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/amd64-coresse-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/amd64-linux-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/arm-core-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/arm-core-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/arm-core.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/arm-vfpv3-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/arm-vfpv3-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/arm-vfpv3.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/arm-with-vfpv3-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/arm-with-vfpv3.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/cachegrind-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/callgrind-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/default.supp (100%) rename Inst/{data/local/Inst => }/lib/valgrind/drd-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/exp-bbv-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/exp-dhat-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/exp-sgcheck-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/getoff-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/helgrind-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/i386-coresse-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/i386-linux-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/lackey-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/libcoregrind-arm-linux.a (100%) rename Inst/{data/local/Inst => }/lib/valgrind/libreplacemalloc_toolpreload-arm-linux.a (100%) rename Inst/{data/local/Inst => }/lib/valgrind/libvex-arm-linux.a (100%) rename Inst/{data/local/Inst => }/lib/valgrind/massif-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/memcheck-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-cp0-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-cp0-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-cp0.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-cpu-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-cpu-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-cpu.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-fpu-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-fpu-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-fpu.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-linux-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips-linux.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-cp0-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-cp0-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-cp0.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-cpu-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-cpu-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-cpu.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-fpu-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-fpu-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-fpu.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-linux-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/mips64-linux.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/none-arm-linux (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-altivec-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-altivec-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-altivec.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-core-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-core-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-core.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-fpu-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-fpu-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-fpu.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-linux-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-linux-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power-linux.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power64-core-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power64-core-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power64-core.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power64-linux-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power64-linux-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/power64-linux.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/powerpc-altivec32l-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/powerpc-altivec32l.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/powerpc-altivec64l-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/powerpc-altivec64l.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390-acr-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390-acr-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390-acr.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390-fpr-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390-fpr-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390-fpr.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390x-core64-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390x-core64-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390x-core64.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390x-generic-valgrind.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390x-generic.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390x-linux64-valgrind-s1.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390x-linux64-valgrind-s2.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/s390x-linux64.xml (100%) rename Inst/{data/local/Inst => }/lib/valgrind/vgpreload_core-arm-linux.so (100%) rename Inst/{data/local/Inst => }/lib/valgrind/vgpreload_drd-arm-linux.so (100%) rename Inst/{data/local/Inst => }/lib/valgrind/vgpreload_exp-dhat-arm-linux.so (100%) rename Inst/{data/local/Inst => }/lib/valgrind/vgpreload_exp-sgcheck-arm-linux.so (100%) rename Inst/{data/local/Inst => }/lib/valgrind/vgpreload_helgrind-arm-linux.so (100%) rename Inst/{data/local/Inst => }/lib/valgrind/vgpreload_massif-arm-linux.so (100%) rename Inst/{data/local/Inst => }/lib/valgrind/vgpreload_memcheck-arm-linux.so (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/FAQ.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/QuickStart.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/bbv-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/cg-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/cl-format.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/cl-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/design-impl.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dh-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.authors.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.news.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.news.old.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.readme-android.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.readme-android_emulator.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.readme-developers.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.readme-mips.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.readme-missing.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.readme-packagers.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.readme-s390.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/dist.readme.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/drd-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/faq.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/hg-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/images/home.png (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/images/next.png (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/images/prev.png (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/images/up.png (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/index.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/license.gfdl.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/license.gpl.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/licenses.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/lk-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/manual-core-adv.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/manual-core.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/manual-intro.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/manual-writing-tools.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/mc-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/ms-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/nl-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/quick-start.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/sg-manual.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/tech-docs.html (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/html/vg_basic.css (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/valgrind_manual.pdf (100%) rename Inst/{data/local/Inst => }/share/doc/valgrind/valgrind_manual.ps (100%) rename Inst/{data/local/Inst => }/share/man/man1/callgrind_annotate.1 (100%) rename Inst/{data/local/Inst => }/share/man/man1/callgrind_control.1 (100%) rename Inst/{data/local/Inst => }/share/man/man1/cg_annotate.1 (100%) rename Inst/{data/local/Inst => }/share/man/man1/cg_diff.1 (100%) rename Inst/{data/local/Inst => }/share/man/man1/cg_merge.1 (100%) rename Inst/{data/local/Inst => }/share/man/man1/ms_print.1 (100%) rename Inst/{data/local/Inst => }/share/man/man1/valgrind-listener.1 (100%) rename Inst/{data/local/Inst => }/share/man/man1/valgrind.1 (100%) rename Inst/{data/local/Inst => }/share/man/man1/vgdb.1 (100%) delete mode 100755 bootstrap_valgrind.sh create mode 100755 valgrind_wrapper.template.sh diff --git a/Inst/data/local/Inst/bin/callgrind_annotate b/Inst/bin/callgrind_annotate similarity index 100% rename from Inst/data/local/Inst/bin/callgrind_annotate rename to Inst/bin/callgrind_annotate diff --git a/Inst/data/local/Inst/bin/callgrind_control b/Inst/bin/callgrind_control similarity index 100% rename from Inst/data/local/Inst/bin/callgrind_control rename to Inst/bin/callgrind_control diff --git a/Inst/data/local/Inst/bin/cg_annotate b/Inst/bin/cg_annotate similarity index 100% rename from Inst/data/local/Inst/bin/cg_annotate rename to Inst/bin/cg_annotate diff --git a/Inst/data/local/Inst/bin/cg_diff b/Inst/bin/cg_diff similarity index 100% rename from Inst/data/local/Inst/bin/cg_diff rename to Inst/bin/cg_diff diff --git a/Inst/data/local/Inst/bin/cg_merge b/Inst/bin/cg_merge similarity index 100% rename from Inst/data/local/Inst/bin/cg_merge rename to Inst/bin/cg_merge diff --git a/Inst/data/local/Inst/bin/ms_print b/Inst/bin/ms_print similarity index 100% rename from Inst/data/local/Inst/bin/ms_print rename to Inst/bin/ms_print diff --git a/Inst/data/local/Inst/bin/valgrind b/Inst/bin/valgrind similarity index 100% rename from Inst/data/local/Inst/bin/valgrind rename to Inst/bin/valgrind diff --git a/Inst/data/local/Inst/bin/valgrind-di-server b/Inst/bin/valgrind-di-server similarity index 100% rename from Inst/data/local/Inst/bin/valgrind-di-server rename to Inst/bin/valgrind-di-server diff --git a/Inst/data/local/Inst/bin/valgrind-listener b/Inst/bin/valgrind-listener similarity index 100% rename from Inst/data/local/Inst/bin/valgrind-listener rename to Inst/bin/valgrind-listener diff --git a/Inst/data/local/Inst/bin/vgdb b/Inst/bin/vgdb similarity index 100% rename from Inst/data/local/Inst/bin/vgdb rename to Inst/bin/vgdb diff --git a/Inst/data/local/Inst/include/valgrind/callgrind.h b/Inst/include/valgrind/callgrind.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/callgrind.h rename to Inst/include/valgrind/callgrind.h diff --git a/Inst/data/local/Inst/include/valgrind/config.h b/Inst/include/valgrind/config.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/config.h rename to Inst/include/valgrind/config.h diff --git a/Inst/data/local/Inst/include/valgrind/drd.h b/Inst/include/valgrind/drd.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/drd.h rename to Inst/include/valgrind/drd.h diff --git a/Inst/data/local/Inst/include/valgrind/helgrind.h b/Inst/include/valgrind/helgrind.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/helgrind.h rename to Inst/include/valgrind/helgrind.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex.h b/Inst/include/valgrind/libvex.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex.h rename to Inst/include/valgrind/libvex.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_basictypes.h b/Inst/include/valgrind/libvex_basictypes.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_basictypes.h rename to Inst/include/valgrind/libvex_basictypes.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_emnote.h b/Inst/include/valgrind/libvex_emnote.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_emnote.h rename to Inst/include/valgrind/libvex_emnote.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_amd64.h b/Inst/include/valgrind/libvex_guest_amd64.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_amd64.h rename to Inst/include/valgrind/libvex_guest_amd64.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_arm.h b/Inst/include/valgrind/libvex_guest_arm.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_arm.h rename to Inst/include/valgrind/libvex_guest_arm.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_arm64.h b/Inst/include/valgrind/libvex_guest_arm64.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_arm64.h rename to Inst/include/valgrind/libvex_guest_arm64.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_mips32.h b/Inst/include/valgrind/libvex_guest_mips32.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_mips32.h rename to Inst/include/valgrind/libvex_guest_mips32.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_mips64.h b/Inst/include/valgrind/libvex_guest_mips64.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_mips64.h rename to Inst/include/valgrind/libvex_guest_mips64.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_offsets.h b/Inst/include/valgrind/libvex_guest_offsets.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_offsets.h rename to Inst/include/valgrind/libvex_guest_offsets.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_ppc32.h b/Inst/include/valgrind/libvex_guest_ppc32.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_ppc32.h rename to Inst/include/valgrind/libvex_guest_ppc32.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_ppc64.h b/Inst/include/valgrind/libvex_guest_ppc64.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_ppc64.h rename to Inst/include/valgrind/libvex_guest_ppc64.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_s390x.h b/Inst/include/valgrind/libvex_guest_s390x.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_s390x.h rename to Inst/include/valgrind/libvex_guest_s390x.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_guest_x86.h b/Inst/include/valgrind/libvex_guest_x86.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_guest_x86.h rename to Inst/include/valgrind/libvex_guest_x86.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_ir.h b/Inst/include/valgrind/libvex_ir.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_ir.h rename to Inst/include/valgrind/libvex_ir.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_s390x_common.h b/Inst/include/valgrind/libvex_s390x_common.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_s390x_common.h rename to Inst/include/valgrind/libvex_s390x_common.h diff --git a/Inst/data/local/Inst/include/valgrind/libvex_trc_values.h b/Inst/include/valgrind/libvex_trc_values.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/libvex_trc_values.h rename to Inst/include/valgrind/libvex_trc_values.h diff --git a/Inst/data/local/Inst/include/valgrind/memcheck.h b/Inst/include/valgrind/memcheck.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/memcheck.h rename to Inst/include/valgrind/memcheck.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_addrinfo.h b/Inst/include/valgrind/pub_tool_addrinfo.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_addrinfo.h rename to Inst/include/valgrind/pub_tool_addrinfo.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_aspacehl.h b/Inst/include/valgrind/pub_tool_aspacehl.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_aspacehl.h rename to Inst/include/valgrind/pub_tool_aspacehl.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_aspacemgr.h b/Inst/include/valgrind/pub_tool_aspacemgr.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_aspacemgr.h rename to Inst/include/valgrind/pub_tool_aspacemgr.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_basics.h b/Inst/include/valgrind/pub_tool_basics.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_basics.h rename to Inst/include/valgrind/pub_tool_basics.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_basics_asm.h b/Inst/include/valgrind/pub_tool_basics_asm.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_basics_asm.h rename to Inst/include/valgrind/pub_tool_basics_asm.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_clientstate.h b/Inst/include/valgrind/pub_tool_clientstate.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_clientstate.h rename to Inst/include/valgrind/pub_tool_clientstate.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_clreq.h b/Inst/include/valgrind/pub_tool_clreq.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_clreq.h rename to Inst/include/valgrind/pub_tool_clreq.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_debuginfo.h b/Inst/include/valgrind/pub_tool_debuginfo.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_debuginfo.h rename to Inst/include/valgrind/pub_tool_debuginfo.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_deduppoolalloc.h b/Inst/include/valgrind/pub_tool_deduppoolalloc.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_deduppoolalloc.h rename to Inst/include/valgrind/pub_tool_deduppoolalloc.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_errormgr.h b/Inst/include/valgrind/pub_tool_errormgr.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_errormgr.h rename to Inst/include/valgrind/pub_tool_errormgr.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_execontext.h b/Inst/include/valgrind/pub_tool_execontext.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_execontext.h rename to Inst/include/valgrind/pub_tool_execontext.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_gdbserver.h b/Inst/include/valgrind/pub_tool_gdbserver.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_gdbserver.h rename to Inst/include/valgrind/pub_tool_gdbserver.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_hashtable.h b/Inst/include/valgrind/pub_tool_hashtable.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_hashtable.h rename to Inst/include/valgrind/pub_tool_hashtable.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_libcassert.h b/Inst/include/valgrind/pub_tool_libcassert.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_libcassert.h rename to Inst/include/valgrind/pub_tool_libcassert.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_libcbase.h b/Inst/include/valgrind/pub_tool_libcbase.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_libcbase.h rename to Inst/include/valgrind/pub_tool_libcbase.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_libcfile.h b/Inst/include/valgrind/pub_tool_libcfile.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_libcfile.h rename to Inst/include/valgrind/pub_tool_libcfile.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_libcprint.h b/Inst/include/valgrind/pub_tool_libcprint.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_libcprint.h rename to Inst/include/valgrind/pub_tool_libcprint.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_libcproc.h b/Inst/include/valgrind/pub_tool_libcproc.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_libcproc.h rename to Inst/include/valgrind/pub_tool_libcproc.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_libcsetjmp.h b/Inst/include/valgrind/pub_tool_libcsetjmp.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_libcsetjmp.h rename to Inst/include/valgrind/pub_tool_libcsetjmp.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_libcsignal.h b/Inst/include/valgrind/pub_tool_libcsignal.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_libcsignal.h rename to Inst/include/valgrind/pub_tool_libcsignal.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_machine.h b/Inst/include/valgrind/pub_tool_machine.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_machine.h rename to Inst/include/valgrind/pub_tool_machine.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_mallocfree.h b/Inst/include/valgrind/pub_tool_mallocfree.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_mallocfree.h rename to Inst/include/valgrind/pub_tool_mallocfree.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_options.h b/Inst/include/valgrind/pub_tool_options.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_options.h rename to Inst/include/valgrind/pub_tool_options.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_oset.h b/Inst/include/valgrind/pub_tool_oset.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_oset.h rename to Inst/include/valgrind/pub_tool_oset.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_poolalloc.h b/Inst/include/valgrind/pub_tool_poolalloc.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_poolalloc.h rename to Inst/include/valgrind/pub_tool_poolalloc.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_rangemap.h b/Inst/include/valgrind/pub_tool_rangemap.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_rangemap.h rename to Inst/include/valgrind/pub_tool_rangemap.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_redir.h b/Inst/include/valgrind/pub_tool_redir.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_redir.h rename to Inst/include/valgrind/pub_tool_redir.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_replacemalloc.h b/Inst/include/valgrind/pub_tool_replacemalloc.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_replacemalloc.h rename to Inst/include/valgrind/pub_tool_replacemalloc.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_seqmatch.h b/Inst/include/valgrind/pub_tool_seqmatch.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_seqmatch.h rename to Inst/include/valgrind/pub_tool_seqmatch.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_signals.h b/Inst/include/valgrind/pub_tool_signals.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_signals.h rename to Inst/include/valgrind/pub_tool_signals.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_sparsewa.h b/Inst/include/valgrind/pub_tool_sparsewa.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_sparsewa.h rename to Inst/include/valgrind/pub_tool_sparsewa.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_stacktrace.h b/Inst/include/valgrind/pub_tool_stacktrace.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_stacktrace.h rename to Inst/include/valgrind/pub_tool_stacktrace.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_threadstate.h b/Inst/include/valgrind/pub_tool_threadstate.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_threadstate.h rename to Inst/include/valgrind/pub_tool_threadstate.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_tooliface.h b/Inst/include/valgrind/pub_tool_tooliface.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_tooliface.h rename to Inst/include/valgrind/pub_tool_tooliface.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_vki.h b/Inst/include/valgrind/pub_tool_vki.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_vki.h rename to Inst/include/valgrind/pub_tool_vki.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_vkiscnums.h b/Inst/include/valgrind/pub_tool_vkiscnums.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_vkiscnums.h rename to Inst/include/valgrind/pub_tool_vkiscnums.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_vkiscnums_asm.h b/Inst/include/valgrind/pub_tool_vkiscnums_asm.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_vkiscnums_asm.h rename to Inst/include/valgrind/pub_tool_vkiscnums_asm.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_wordfm.h b/Inst/include/valgrind/pub_tool_wordfm.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_wordfm.h rename to Inst/include/valgrind/pub_tool_wordfm.h diff --git a/Inst/data/local/Inst/include/valgrind/pub_tool_xarray.h b/Inst/include/valgrind/pub_tool_xarray.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/pub_tool_xarray.h rename to Inst/include/valgrind/pub_tool_xarray.h diff --git a/Inst/data/local/Inst/include/valgrind/valgrind.h b/Inst/include/valgrind/valgrind.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/valgrind.h rename to Inst/include/valgrind/valgrind.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-amd64-linux.h b/Inst/include/valgrind/vki/vki-amd64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-amd64-linux.h rename to Inst/include/valgrind/vki/vki-amd64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-arm-linux.h b/Inst/include/valgrind/vki/vki-arm-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-arm-linux.h rename to Inst/include/valgrind/vki/vki-arm-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-arm64-linux.h b/Inst/include/valgrind/vki/vki-arm64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-arm64-linux.h rename to Inst/include/valgrind/vki/vki-arm64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-darwin.h b/Inst/include/valgrind/vki/vki-darwin.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-darwin.h rename to Inst/include/valgrind/vki/vki-darwin.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-linux-drm.h b/Inst/include/valgrind/vki/vki-linux-drm.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-linux-drm.h rename to Inst/include/valgrind/vki/vki-linux-drm.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-linux.h b/Inst/include/valgrind/vki/vki-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-linux.h rename to Inst/include/valgrind/vki/vki-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-mips32-linux.h b/Inst/include/valgrind/vki/vki-mips32-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-mips32-linux.h rename to Inst/include/valgrind/vki/vki-mips32-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-mips64-linux.h b/Inst/include/valgrind/vki/vki-mips64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-mips64-linux.h rename to Inst/include/valgrind/vki/vki-mips64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-amd64-linux.h b/Inst/include/valgrind/vki/vki-posixtypes-amd64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-amd64-linux.h rename to Inst/include/valgrind/vki/vki-posixtypes-amd64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-arm-linux.h b/Inst/include/valgrind/vki/vki-posixtypes-arm-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-arm-linux.h rename to Inst/include/valgrind/vki/vki-posixtypes-arm-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-arm64-linux.h b/Inst/include/valgrind/vki/vki-posixtypes-arm64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-arm64-linux.h rename to Inst/include/valgrind/vki/vki-posixtypes-arm64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-mips32-linux.h b/Inst/include/valgrind/vki/vki-posixtypes-mips32-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-mips32-linux.h rename to Inst/include/valgrind/vki/vki-posixtypes-mips32-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-mips64-linux.h b/Inst/include/valgrind/vki/vki-posixtypes-mips64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-mips64-linux.h rename to Inst/include/valgrind/vki/vki-posixtypes-mips64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-ppc32-linux.h b/Inst/include/valgrind/vki/vki-posixtypes-ppc32-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-ppc32-linux.h rename to Inst/include/valgrind/vki/vki-posixtypes-ppc32-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-ppc64-linux.h b/Inst/include/valgrind/vki/vki-posixtypes-ppc64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-ppc64-linux.h rename to Inst/include/valgrind/vki/vki-posixtypes-ppc64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-s390x-linux.h b/Inst/include/valgrind/vki/vki-posixtypes-s390x-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-s390x-linux.h rename to Inst/include/valgrind/vki/vki-posixtypes-s390x-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-x86-linux.h b/Inst/include/valgrind/vki/vki-posixtypes-x86-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-posixtypes-x86-linux.h rename to Inst/include/valgrind/vki/vki-posixtypes-x86-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-ppc32-linux.h b/Inst/include/valgrind/vki/vki-ppc32-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-ppc32-linux.h rename to Inst/include/valgrind/vki/vki-ppc32-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-ppc64-linux.h b/Inst/include/valgrind/vki/vki-ppc64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-ppc64-linux.h rename to Inst/include/valgrind/vki/vki-ppc64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-s390x-linux.h b/Inst/include/valgrind/vki/vki-s390x-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-s390x-linux.h rename to Inst/include/valgrind/vki/vki-s390x-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-amd64-linux.h b/Inst/include/valgrind/vki/vki-scnums-amd64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-amd64-linux.h rename to Inst/include/valgrind/vki/vki-scnums-amd64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-arm-linux.h b/Inst/include/valgrind/vki/vki-scnums-arm-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-arm-linux.h rename to Inst/include/valgrind/vki/vki-scnums-arm-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-arm64-linux.h b/Inst/include/valgrind/vki/vki-scnums-arm64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-arm64-linux.h rename to Inst/include/valgrind/vki/vki-scnums-arm64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-darwin.h b/Inst/include/valgrind/vki/vki-scnums-darwin.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-darwin.h rename to Inst/include/valgrind/vki/vki-scnums-darwin.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-mips32-linux.h b/Inst/include/valgrind/vki/vki-scnums-mips32-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-mips32-linux.h rename to Inst/include/valgrind/vki/vki-scnums-mips32-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-mips64-linux.h b/Inst/include/valgrind/vki/vki-scnums-mips64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-mips64-linux.h rename to Inst/include/valgrind/vki/vki-scnums-mips64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-ppc32-linux.h b/Inst/include/valgrind/vki/vki-scnums-ppc32-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-ppc32-linux.h rename to Inst/include/valgrind/vki/vki-scnums-ppc32-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-ppc64-linux.h b/Inst/include/valgrind/vki/vki-scnums-ppc64-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-ppc64-linux.h rename to Inst/include/valgrind/vki/vki-scnums-ppc64-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-s390x-linux.h b/Inst/include/valgrind/vki/vki-scnums-s390x-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-s390x-linux.h rename to Inst/include/valgrind/vki/vki-scnums-s390x-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-scnums-x86-linux.h b/Inst/include/valgrind/vki/vki-scnums-x86-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-scnums-x86-linux.h rename to Inst/include/valgrind/vki/vki-scnums-x86-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-x86-linux.h b/Inst/include/valgrind/vki/vki-x86-linux.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-x86-linux.h rename to Inst/include/valgrind/vki/vki-x86-linux.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-domctl.h b/Inst/include/valgrind/vki/vki-xen-domctl.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-domctl.h rename to Inst/include/valgrind/vki/vki-xen-domctl.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-evtchn.h b/Inst/include/valgrind/vki/vki-xen-evtchn.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-evtchn.h rename to Inst/include/valgrind/vki/vki-xen-evtchn.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-gnttab.h b/Inst/include/valgrind/vki/vki-xen-gnttab.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-gnttab.h rename to Inst/include/valgrind/vki/vki-xen-gnttab.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-hvm.h b/Inst/include/valgrind/vki/vki-xen-hvm.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-hvm.h rename to Inst/include/valgrind/vki/vki-xen-hvm.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-memory.h b/Inst/include/valgrind/vki/vki-xen-memory.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-memory.h rename to Inst/include/valgrind/vki/vki-xen-memory.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-mmuext.h b/Inst/include/valgrind/vki/vki-xen-mmuext.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-mmuext.h rename to Inst/include/valgrind/vki/vki-xen-mmuext.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-sysctl.h b/Inst/include/valgrind/vki/vki-xen-sysctl.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-sysctl.h rename to Inst/include/valgrind/vki/vki-xen-sysctl.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-tmem.h b/Inst/include/valgrind/vki/vki-xen-tmem.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-tmem.h rename to Inst/include/valgrind/vki/vki-xen-tmem.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-version.h b/Inst/include/valgrind/vki/vki-xen-version.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-version.h rename to Inst/include/valgrind/vki/vki-xen-version.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen-x86.h b/Inst/include/valgrind/vki/vki-xen-x86.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen-x86.h rename to Inst/include/valgrind/vki/vki-xen-x86.h diff --git a/Inst/data/local/Inst/include/valgrind/vki/vki-xen.h b/Inst/include/valgrind/vki/vki-xen.h similarity index 100% rename from Inst/data/local/Inst/include/valgrind/vki/vki-xen.h rename to Inst/include/valgrind/vki/vki-xen.h diff --git a/Inst/data/local/Inst/lib/pkgconfig/valgrind.pc b/Inst/lib/pkgconfig/valgrind.pc similarity index 100% rename from Inst/data/local/Inst/lib/pkgconfig/valgrind.pc rename to Inst/lib/pkgconfig/valgrind.pc diff --git a/Inst/data/local/Inst/lib/valgrind/32bit-core-valgrind-s1.xml b/Inst/lib/valgrind/32bit-core-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/32bit-core-valgrind-s1.xml rename to Inst/lib/valgrind/32bit-core-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/32bit-core-valgrind-s2.xml b/Inst/lib/valgrind/32bit-core-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/32bit-core-valgrind-s2.xml rename to Inst/lib/valgrind/32bit-core-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/32bit-core.xml b/Inst/lib/valgrind/32bit-core.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/32bit-core.xml rename to Inst/lib/valgrind/32bit-core.xml diff --git a/Inst/data/local/Inst/lib/valgrind/32bit-linux-valgrind-s1.xml b/Inst/lib/valgrind/32bit-linux-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/32bit-linux-valgrind-s1.xml rename to Inst/lib/valgrind/32bit-linux-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/32bit-linux-valgrind-s2.xml b/Inst/lib/valgrind/32bit-linux-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/32bit-linux-valgrind-s2.xml rename to Inst/lib/valgrind/32bit-linux-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/32bit-linux.xml b/Inst/lib/valgrind/32bit-linux.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/32bit-linux.xml rename to Inst/lib/valgrind/32bit-linux.xml diff --git a/Inst/data/local/Inst/lib/valgrind/32bit-sse-valgrind-s1.xml b/Inst/lib/valgrind/32bit-sse-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/32bit-sse-valgrind-s1.xml rename to Inst/lib/valgrind/32bit-sse-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/32bit-sse-valgrind-s2.xml b/Inst/lib/valgrind/32bit-sse-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/32bit-sse-valgrind-s2.xml rename to Inst/lib/valgrind/32bit-sse-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/32bit-sse.xml b/Inst/lib/valgrind/32bit-sse.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/32bit-sse.xml rename to Inst/lib/valgrind/32bit-sse.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-avx-valgrind-s1.xml b/Inst/lib/valgrind/64bit-avx-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-avx-valgrind-s1.xml rename to Inst/lib/valgrind/64bit-avx-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-avx-valgrind-s2.xml b/Inst/lib/valgrind/64bit-avx-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-avx-valgrind-s2.xml rename to Inst/lib/valgrind/64bit-avx-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-avx.xml b/Inst/lib/valgrind/64bit-avx.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-avx.xml rename to Inst/lib/valgrind/64bit-avx.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-core-valgrind-s1.xml b/Inst/lib/valgrind/64bit-core-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-core-valgrind-s1.xml rename to Inst/lib/valgrind/64bit-core-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-core-valgrind-s2.xml b/Inst/lib/valgrind/64bit-core-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-core-valgrind-s2.xml rename to Inst/lib/valgrind/64bit-core-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-core.xml b/Inst/lib/valgrind/64bit-core.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-core.xml rename to Inst/lib/valgrind/64bit-core.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-linux-valgrind-s1.xml b/Inst/lib/valgrind/64bit-linux-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-linux-valgrind-s1.xml rename to Inst/lib/valgrind/64bit-linux-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-linux-valgrind-s2.xml b/Inst/lib/valgrind/64bit-linux-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-linux-valgrind-s2.xml rename to Inst/lib/valgrind/64bit-linux-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-linux.xml b/Inst/lib/valgrind/64bit-linux.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-linux.xml rename to Inst/lib/valgrind/64bit-linux.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-sse-valgrind-s1.xml b/Inst/lib/valgrind/64bit-sse-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-sse-valgrind-s1.xml rename to Inst/lib/valgrind/64bit-sse-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-sse-valgrind-s2.xml b/Inst/lib/valgrind/64bit-sse-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-sse-valgrind-s2.xml rename to Inst/lib/valgrind/64bit-sse-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/64bit-sse.xml b/Inst/lib/valgrind/64bit-sse.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/64bit-sse.xml rename to Inst/lib/valgrind/64bit-sse.xml diff --git a/Inst/data/local/Inst/lib/valgrind/amd64-avx-coresse-valgrind.xml b/Inst/lib/valgrind/amd64-avx-coresse-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/amd64-avx-coresse-valgrind.xml rename to Inst/lib/valgrind/amd64-avx-coresse-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/amd64-avx-coresse.xml b/Inst/lib/valgrind/amd64-avx-coresse.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/amd64-avx-coresse.xml rename to Inst/lib/valgrind/amd64-avx-coresse.xml diff --git a/Inst/data/local/Inst/lib/valgrind/amd64-avx-linux-valgrind.xml b/Inst/lib/valgrind/amd64-avx-linux-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/amd64-avx-linux-valgrind.xml rename to Inst/lib/valgrind/amd64-avx-linux-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/amd64-avx-linux.xml b/Inst/lib/valgrind/amd64-avx-linux.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/amd64-avx-linux.xml rename to Inst/lib/valgrind/amd64-avx-linux.xml diff --git a/Inst/data/local/Inst/lib/valgrind/amd64-coresse-valgrind.xml b/Inst/lib/valgrind/amd64-coresse-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/amd64-coresse-valgrind.xml rename to Inst/lib/valgrind/amd64-coresse-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/amd64-linux-valgrind.xml b/Inst/lib/valgrind/amd64-linux-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/amd64-linux-valgrind.xml rename to Inst/lib/valgrind/amd64-linux-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/arm-core-valgrind-s1.xml b/Inst/lib/valgrind/arm-core-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/arm-core-valgrind-s1.xml rename to Inst/lib/valgrind/arm-core-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/arm-core-valgrind-s2.xml b/Inst/lib/valgrind/arm-core-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/arm-core-valgrind-s2.xml rename to Inst/lib/valgrind/arm-core-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/arm-core.xml b/Inst/lib/valgrind/arm-core.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/arm-core.xml rename to Inst/lib/valgrind/arm-core.xml diff --git a/Inst/data/local/Inst/lib/valgrind/arm-vfpv3-valgrind-s1.xml b/Inst/lib/valgrind/arm-vfpv3-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/arm-vfpv3-valgrind-s1.xml rename to Inst/lib/valgrind/arm-vfpv3-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/arm-vfpv3-valgrind-s2.xml b/Inst/lib/valgrind/arm-vfpv3-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/arm-vfpv3-valgrind-s2.xml rename to Inst/lib/valgrind/arm-vfpv3-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/arm-vfpv3.xml b/Inst/lib/valgrind/arm-vfpv3.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/arm-vfpv3.xml rename to Inst/lib/valgrind/arm-vfpv3.xml diff --git a/Inst/data/local/Inst/lib/valgrind/arm-with-vfpv3-valgrind.xml b/Inst/lib/valgrind/arm-with-vfpv3-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/arm-with-vfpv3-valgrind.xml rename to Inst/lib/valgrind/arm-with-vfpv3-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/arm-with-vfpv3.xml b/Inst/lib/valgrind/arm-with-vfpv3.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/arm-with-vfpv3.xml rename to Inst/lib/valgrind/arm-with-vfpv3.xml diff --git a/Inst/data/local/Inst/lib/valgrind/cachegrind-arm-linux b/Inst/lib/valgrind/cachegrind-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/cachegrind-arm-linux rename to Inst/lib/valgrind/cachegrind-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/callgrind-arm-linux b/Inst/lib/valgrind/callgrind-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/callgrind-arm-linux rename to Inst/lib/valgrind/callgrind-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/default.supp b/Inst/lib/valgrind/default.supp similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/default.supp rename to Inst/lib/valgrind/default.supp diff --git a/Inst/data/local/Inst/lib/valgrind/drd-arm-linux b/Inst/lib/valgrind/drd-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/drd-arm-linux rename to Inst/lib/valgrind/drd-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/exp-bbv-arm-linux b/Inst/lib/valgrind/exp-bbv-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/exp-bbv-arm-linux rename to Inst/lib/valgrind/exp-bbv-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/exp-dhat-arm-linux b/Inst/lib/valgrind/exp-dhat-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/exp-dhat-arm-linux rename to Inst/lib/valgrind/exp-dhat-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/exp-sgcheck-arm-linux b/Inst/lib/valgrind/exp-sgcheck-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/exp-sgcheck-arm-linux rename to Inst/lib/valgrind/exp-sgcheck-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/getoff-arm-linux b/Inst/lib/valgrind/getoff-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/getoff-arm-linux rename to Inst/lib/valgrind/getoff-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/helgrind-arm-linux b/Inst/lib/valgrind/helgrind-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/helgrind-arm-linux rename to Inst/lib/valgrind/helgrind-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/i386-coresse-valgrind.xml b/Inst/lib/valgrind/i386-coresse-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/i386-coresse-valgrind.xml rename to Inst/lib/valgrind/i386-coresse-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/i386-linux-valgrind.xml b/Inst/lib/valgrind/i386-linux-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/i386-linux-valgrind.xml rename to Inst/lib/valgrind/i386-linux-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/lackey-arm-linux b/Inst/lib/valgrind/lackey-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/lackey-arm-linux rename to Inst/lib/valgrind/lackey-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/libcoregrind-arm-linux.a b/Inst/lib/valgrind/libcoregrind-arm-linux.a similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/libcoregrind-arm-linux.a rename to Inst/lib/valgrind/libcoregrind-arm-linux.a diff --git a/Inst/data/local/Inst/lib/valgrind/libreplacemalloc_toolpreload-arm-linux.a b/Inst/lib/valgrind/libreplacemalloc_toolpreload-arm-linux.a similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/libreplacemalloc_toolpreload-arm-linux.a rename to Inst/lib/valgrind/libreplacemalloc_toolpreload-arm-linux.a diff --git a/Inst/data/local/Inst/lib/valgrind/libvex-arm-linux.a b/Inst/lib/valgrind/libvex-arm-linux.a similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/libvex-arm-linux.a rename to Inst/lib/valgrind/libvex-arm-linux.a diff --git a/Inst/data/local/Inst/lib/valgrind/massif-arm-linux b/Inst/lib/valgrind/massif-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/massif-arm-linux rename to Inst/lib/valgrind/massif-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/memcheck-arm-linux b/Inst/lib/valgrind/memcheck-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/memcheck-arm-linux rename to Inst/lib/valgrind/memcheck-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/mips-cp0-valgrind-s1.xml b/Inst/lib/valgrind/mips-cp0-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-cp0-valgrind-s1.xml rename to Inst/lib/valgrind/mips-cp0-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-cp0-valgrind-s2.xml b/Inst/lib/valgrind/mips-cp0-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-cp0-valgrind-s2.xml rename to Inst/lib/valgrind/mips-cp0-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-cp0.xml b/Inst/lib/valgrind/mips-cp0.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-cp0.xml rename to Inst/lib/valgrind/mips-cp0.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-cpu-valgrind-s1.xml b/Inst/lib/valgrind/mips-cpu-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-cpu-valgrind-s1.xml rename to Inst/lib/valgrind/mips-cpu-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-cpu-valgrind-s2.xml b/Inst/lib/valgrind/mips-cpu-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-cpu-valgrind-s2.xml rename to Inst/lib/valgrind/mips-cpu-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-cpu.xml b/Inst/lib/valgrind/mips-cpu.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-cpu.xml rename to Inst/lib/valgrind/mips-cpu.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-fpu-valgrind-s1.xml b/Inst/lib/valgrind/mips-fpu-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-fpu-valgrind-s1.xml rename to Inst/lib/valgrind/mips-fpu-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-fpu-valgrind-s2.xml b/Inst/lib/valgrind/mips-fpu-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-fpu-valgrind-s2.xml rename to Inst/lib/valgrind/mips-fpu-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-fpu.xml b/Inst/lib/valgrind/mips-fpu.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-fpu.xml rename to Inst/lib/valgrind/mips-fpu.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-linux-valgrind.xml b/Inst/lib/valgrind/mips-linux-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-linux-valgrind.xml rename to Inst/lib/valgrind/mips-linux-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips-linux.xml b/Inst/lib/valgrind/mips-linux.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips-linux.xml rename to Inst/lib/valgrind/mips-linux.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-cp0-valgrind-s1.xml b/Inst/lib/valgrind/mips64-cp0-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-cp0-valgrind-s1.xml rename to Inst/lib/valgrind/mips64-cp0-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-cp0-valgrind-s2.xml b/Inst/lib/valgrind/mips64-cp0-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-cp0-valgrind-s2.xml rename to Inst/lib/valgrind/mips64-cp0-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-cp0.xml b/Inst/lib/valgrind/mips64-cp0.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-cp0.xml rename to Inst/lib/valgrind/mips64-cp0.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-cpu-valgrind-s1.xml b/Inst/lib/valgrind/mips64-cpu-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-cpu-valgrind-s1.xml rename to Inst/lib/valgrind/mips64-cpu-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-cpu-valgrind-s2.xml b/Inst/lib/valgrind/mips64-cpu-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-cpu-valgrind-s2.xml rename to Inst/lib/valgrind/mips64-cpu-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-cpu.xml b/Inst/lib/valgrind/mips64-cpu.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-cpu.xml rename to Inst/lib/valgrind/mips64-cpu.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-fpu-valgrind-s1.xml b/Inst/lib/valgrind/mips64-fpu-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-fpu-valgrind-s1.xml rename to Inst/lib/valgrind/mips64-fpu-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-fpu-valgrind-s2.xml b/Inst/lib/valgrind/mips64-fpu-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-fpu-valgrind-s2.xml rename to Inst/lib/valgrind/mips64-fpu-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-fpu.xml b/Inst/lib/valgrind/mips64-fpu.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-fpu.xml rename to Inst/lib/valgrind/mips64-fpu.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-linux-valgrind.xml b/Inst/lib/valgrind/mips64-linux-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-linux-valgrind.xml rename to Inst/lib/valgrind/mips64-linux-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/mips64-linux.xml b/Inst/lib/valgrind/mips64-linux.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/mips64-linux.xml rename to Inst/lib/valgrind/mips64-linux.xml diff --git a/Inst/data/local/Inst/lib/valgrind/none-arm-linux b/Inst/lib/valgrind/none-arm-linux similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/none-arm-linux rename to Inst/lib/valgrind/none-arm-linux diff --git a/Inst/data/local/Inst/lib/valgrind/power-altivec-valgrind-s1.xml b/Inst/lib/valgrind/power-altivec-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-altivec-valgrind-s1.xml rename to Inst/lib/valgrind/power-altivec-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-altivec-valgrind-s2.xml b/Inst/lib/valgrind/power-altivec-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-altivec-valgrind-s2.xml rename to Inst/lib/valgrind/power-altivec-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-altivec.xml b/Inst/lib/valgrind/power-altivec.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-altivec.xml rename to Inst/lib/valgrind/power-altivec.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-core-valgrind-s1.xml b/Inst/lib/valgrind/power-core-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-core-valgrind-s1.xml rename to Inst/lib/valgrind/power-core-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-core-valgrind-s2.xml b/Inst/lib/valgrind/power-core-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-core-valgrind-s2.xml rename to Inst/lib/valgrind/power-core-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-core.xml b/Inst/lib/valgrind/power-core.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-core.xml rename to Inst/lib/valgrind/power-core.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-fpu-valgrind-s1.xml b/Inst/lib/valgrind/power-fpu-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-fpu-valgrind-s1.xml rename to Inst/lib/valgrind/power-fpu-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-fpu-valgrind-s2.xml b/Inst/lib/valgrind/power-fpu-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-fpu-valgrind-s2.xml rename to Inst/lib/valgrind/power-fpu-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-fpu.xml b/Inst/lib/valgrind/power-fpu.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-fpu.xml rename to Inst/lib/valgrind/power-fpu.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-linux-valgrind-s1.xml b/Inst/lib/valgrind/power-linux-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-linux-valgrind-s1.xml rename to Inst/lib/valgrind/power-linux-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-linux-valgrind-s2.xml b/Inst/lib/valgrind/power-linux-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-linux-valgrind-s2.xml rename to Inst/lib/valgrind/power-linux-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power-linux.xml b/Inst/lib/valgrind/power-linux.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power-linux.xml rename to Inst/lib/valgrind/power-linux.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power64-core-valgrind-s1.xml b/Inst/lib/valgrind/power64-core-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power64-core-valgrind-s1.xml rename to Inst/lib/valgrind/power64-core-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power64-core-valgrind-s2.xml b/Inst/lib/valgrind/power64-core-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power64-core-valgrind-s2.xml rename to Inst/lib/valgrind/power64-core-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power64-core.xml b/Inst/lib/valgrind/power64-core.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power64-core.xml rename to Inst/lib/valgrind/power64-core.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power64-linux-valgrind-s1.xml b/Inst/lib/valgrind/power64-linux-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power64-linux-valgrind-s1.xml rename to Inst/lib/valgrind/power64-linux-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power64-linux-valgrind-s2.xml b/Inst/lib/valgrind/power64-linux-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power64-linux-valgrind-s2.xml rename to Inst/lib/valgrind/power64-linux-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/power64-linux.xml b/Inst/lib/valgrind/power64-linux.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/power64-linux.xml rename to Inst/lib/valgrind/power64-linux.xml diff --git a/Inst/data/local/Inst/lib/valgrind/powerpc-altivec32l-valgrind.xml b/Inst/lib/valgrind/powerpc-altivec32l-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/powerpc-altivec32l-valgrind.xml rename to Inst/lib/valgrind/powerpc-altivec32l-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/powerpc-altivec32l.xml b/Inst/lib/valgrind/powerpc-altivec32l.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/powerpc-altivec32l.xml rename to Inst/lib/valgrind/powerpc-altivec32l.xml diff --git a/Inst/data/local/Inst/lib/valgrind/powerpc-altivec64l-valgrind.xml b/Inst/lib/valgrind/powerpc-altivec64l-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/powerpc-altivec64l-valgrind.xml rename to Inst/lib/valgrind/powerpc-altivec64l-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/powerpc-altivec64l.xml b/Inst/lib/valgrind/powerpc-altivec64l.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/powerpc-altivec64l.xml rename to Inst/lib/valgrind/powerpc-altivec64l.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390-acr-valgrind-s1.xml b/Inst/lib/valgrind/s390-acr-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390-acr-valgrind-s1.xml rename to Inst/lib/valgrind/s390-acr-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390-acr-valgrind-s2.xml b/Inst/lib/valgrind/s390-acr-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390-acr-valgrind-s2.xml rename to Inst/lib/valgrind/s390-acr-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390-acr.xml b/Inst/lib/valgrind/s390-acr.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390-acr.xml rename to Inst/lib/valgrind/s390-acr.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390-fpr-valgrind-s1.xml b/Inst/lib/valgrind/s390-fpr-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390-fpr-valgrind-s1.xml rename to Inst/lib/valgrind/s390-fpr-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390-fpr-valgrind-s2.xml b/Inst/lib/valgrind/s390-fpr-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390-fpr-valgrind-s2.xml rename to Inst/lib/valgrind/s390-fpr-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390-fpr.xml b/Inst/lib/valgrind/s390-fpr.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390-fpr.xml rename to Inst/lib/valgrind/s390-fpr.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390x-core64-valgrind-s1.xml b/Inst/lib/valgrind/s390x-core64-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390x-core64-valgrind-s1.xml rename to Inst/lib/valgrind/s390x-core64-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390x-core64-valgrind-s2.xml b/Inst/lib/valgrind/s390x-core64-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390x-core64-valgrind-s2.xml rename to Inst/lib/valgrind/s390x-core64-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390x-core64.xml b/Inst/lib/valgrind/s390x-core64.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390x-core64.xml rename to Inst/lib/valgrind/s390x-core64.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390x-generic-valgrind.xml b/Inst/lib/valgrind/s390x-generic-valgrind.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390x-generic-valgrind.xml rename to Inst/lib/valgrind/s390x-generic-valgrind.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390x-generic.xml b/Inst/lib/valgrind/s390x-generic.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390x-generic.xml rename to Inst/lib/valgrind/s390x-generic.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390x-linux64-valgrind-s1.xml b/Inst/lib/valgrind/s390x-linux64-valgrind-s1.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390x-linux64-valgrind-s1.xml rename to Inst/lib/valgrind/s390x-linux64-valgrind-s1.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390x-linux64-valgrind-s2.xml b/Inst/lib/valgrind/s390x-linux64-valgrind-s2.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390x-linux64-valgrind-s2.xml rename to Inst/lib/valgrind/s390x-linux64-valgrind-s2.xml diff --git a/Inst/data/local/Inst/lib/valgrind/s390x-linux64.xml b/Inst/lib/valgrind/s390x-linux64.xml similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/s390x-linux64.xml rename to Inst/lib/valgrind/s390x-linux64.xml diff --git a/Inst/data/local/Inst/lib/valgrind/vgpreload_core-arm-linux.so b/Inst/lib/valgrind/vgpreload_core-arm-linux.so similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/vgpreload_core-arm-linux.so rename to Inst/lib/valgrind/vgpreload_core-arm-linux.so diff --git a/Inst/data/local/Inst/lib/valgrind/vgpreload_drd-arm-linux.so b/Inst/lib/valgrind/vgpreload_drd-arm-linux.so similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/vgpreload_drd-arm-linux.so rename to Inst/lib/valgrind/vgpreload_drd-arm-linux.so diff --git a/Inst/data/local/Inst/lib/valgrind/vgpreload_exp-dhat-arm-linux.so b/Inst/lib/valgrind/vgpreload_exp-dhat-arm-linux.so similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/vgpreload_exp-dhat-arm-linux.so rename to Inst/lib/valgrind/vgpreload_exp-dhat-arm-linux.so diff --git a/Inst/data/local/Inst/lib/valgrind/vgpreload_exp-sgcheck-arm-linux.so b/Inst/lib/valgrind/vgpreload_exp-sgcheck-arm-linux.so similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/vgpreload_exp-sgcheck-arm-linux.so rename to Inst/lib/valgrind/vgpreload_exp-sgcheck-arm-linux.so diff --git a/Inst/data/local/Inst/lib/valgrind/vgpreload_helgrind-arm-linux.so b/Inst/lib/valgrind/vgpreload_helgrind-arm-linux.so similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/vgpreload_helgrind-arm-linux.so rename to Inst/lib/valgrind/vgpreload_helgrind-arm-linux.so diff --git a/Inst/data/local/Inst/lib/valgrind/vgpreload_massif-arm-linux.so b/Inst/lib/valgrind/vgpreload_massif-arm-linux.so similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/vgpreload_massif-arm-linux.so rename to Inst/lib/valgrind/vgpreload_massif-arm-linux.so diff --git a/Inst/data/local/Inst/lib/valgrind/vgpreload_memcheck-arm-linux.so b/Inst/lib/valgrind/vgpreload_memcheck-arm-linux.so similarity index 100% rename from Inst/data/local/Inst/lib/valgrind/vgpreload_memcheck-arm-linux.so rename to Inst/lib/valgrind/vgpreload_memcheck-arm-linux.so diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/FAQ.html b/Inst/share/doc/valgrind/html/FAQ.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/FAQ.html rename to Inst/share/doc/valgrind/html/FAQ.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/QuickStart.html b/Inst/share/doc/valgrind/html/QuickStart.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/QuickStart.html rename to Inst/share/doc/valgrind/html/QuickStart.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/bbv-manual.html b/Inst/share/doc/valgrind/html/bbv-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/bbv-manual.html rename to Inst/share/doc/valgrind/html/bbv-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/cg-manual.html b/Inst/share/doc/valgrind/html/cg-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/cg-manual.html rename to Inst/share/doc/valgrind/html/cg-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/cl-format.html b/Inst/share/doc/valgrind/html/cl-format.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/cl-format.html rename to Inst/share/doc/valgrind/html/cl-format.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/cl-manual.html b/Inst/share/doc/valgrind/html/cl-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/cl-manual.html rename to Inst/share/doc/valgrind/html/cl-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/design-impl.html b/Inst/share/doc/valgrind/html/design-impl.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/design-impl.html rename to Inst/share/doc/valgrind/html/design-impl.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dh-manual.html b/Inst/share/doc/valgrind/html/dh-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dh-manual.html rename to Inst/share/doc/valgrind/html/dh-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.authors.html b/Inst/share/doc/valgrind/html/dist.authors.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.authors.html rename to Inst/share/doc/valgrind/html/dist.authors.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.html b/Inst/share/doc/valgrind/html/dist.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.html rename to Inst/share/doc/valgrind/html/dist.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.news.html b/Inst/share/doc/valgrind/html/dist.news.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.news.html rename to Inst/share/doc/valgrind/html/dist.news.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.news.old.html b/Inst/share/doc/valgrind/html/dist.news.old.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.news.old.html rename to Inst/share/doc/valgrind/html/dist.news.old.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-android.html b/Inst/share/doc/valgrind/html/dist.readme-android.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-android.html rename to Inst/share/doc/valgrind/html/dist.readme-android.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-android_emulator.html b/Inst/share/doc/valgrind/html/dist.readme-android_emulator.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-android_emulator.html rename to Inst/share/doc/valgrind/html/dist.readme-android_emulator.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-developers.html b/Inst/share/doc/valgrind/html/dist.readme-developers.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-developers.html rename to Inst/share/doc/valgrind/html/dist.readme-developers.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-mips.html b/Inst/share/doc/valgrind/html/dist.readme-mips.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-mips.html rename to Inst/share/doc/valgrind/html/dist.readme-mips.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-missing.html b/Inst/share/doc/valgrind/html/dist.readme-missing.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-missing.html rename to Inst/share/doc/valgrind/html/dist.readme-missing.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-packagers.html b/Inst/share/doc/valgrind/html/dist.readme-packagers.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-packagers.html rename to Inst/share/doc/valgrind/html/dist.readme-packagers.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-s390.html b/Inst/share/doc/valgrind/html/dist.readme-s390.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.readme-s390.html rename to Inst/share/doc/valgrind/html/dist.readme-s390.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/dist.readme.html b/Inst/share/doc/valgrind/html/dist.readme.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/dist.readme.html rename to Inst/share/doc/valgrind/html/dist.readme.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/drd-manual.html b/Inst/share/doc/valgrind/html/drd-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/drd-manual.html rename to Inst/share/doc/valgrind/html/drd-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/faq.html b/Inst/share/doc/valgrind/html/faq.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/faq.html rename to Inst/share/doc/valgrind/html/faq.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/hg-manual.html b/Inst/share/doc/valgrind/html/hg-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/hg-manual.html rename to Inst/share/doc/valgrind/html/hg-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/images/home.png b/Inst/share/doc/valgrind/html/images/home.png similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/images/home.png rename to Inst/share/doc/valgrind/html/images/home.png diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/images/next.png b/Inst/share/doc/valgrind/html/images/next.png similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/images/next.png rename to Inst/share/doc/valgrind/html/images/next.png diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/images/prev.png b/Inst/share/doc/valgrind/html/images/prev.png similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/images/prev.png rename to Inst/share/doc/valgrind/html/images/prev.png diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/images/up.png b/Inst/share/doc/valgrind/html/images/up.png similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/images/up.png rename to Inst/share/doc/valgrind/html/images/up.png diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/index.html b/Inst/share/doc/valgrind/html/index.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/index.html rename to Inst/share/doc/valgrind/html/index.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/license.gfdl.html b/Inst/share/doc/valgrind/html/license.gfdl.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/license.gfdl.html rename to Inst/share/doc/valgrind/html/license.gfdl.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/license.gpl.html b/Inst/share/doc/valgrind/html/license.gpl.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/license.gpl.html rename to Inst/share/doc/valgrind/html/license.gpl.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/licenses.html b/Inst/share/doc/valgrind/html/licenses.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/licenses.html rename to Inst/share/doc/valgrind/html/licenses.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/lk-manual.html b/Inst/share/doc/valgrind/html/lk-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/lk-manual.html rename to Inst/share/doc/valgrind/html/lk-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/manual-core-adv.html b/Inst/share/doc/valgrind/html/manual-core-adv.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/manual-core-adv.html rename to Inst/share/doc/valgrind/html/manual-core-adv.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/manual-core.html b/Inst/share/doc/valgrind/html/manual-core.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/manual-core.html rename to Inst/share/doc/valgrind/html/manual-core.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/manual-intro.html b/Inst/share/doc/valgrind/html/manual-intro.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/manual-intro.html rename to Inst/share/doc/valgrind/html/manual-intro.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/manual-writing-tools.html b/Inst/share/doc/valgrind/html/manual-writing-tools.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/manual-writing-tools.html rename to Inst/share/doc/valgrind/html/manual-writing-tools.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/manual.html b/Inst/share/doc/valgrind/html/manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/manual.html rename to Inst/share/doc/valgrind/html/manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/mc-manual.html b/Inst/share/doc/valgrind/html/mc-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/mc-manual.html rename to Inst/share/doc/valgrind/html/mc-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/ms-manual.html b/Inst/share/doc/valgrind/html/ms-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/ms-manual.html rename to Inst/share/doc/valgrind/html/ms-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/nl-manual.html b/Inst/share/doc/valgrind/html/nl-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/nl-manual.html rename to Inst/share/doc/valgrind/html/nl-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/quick-start.html b/Inst/share/doc/valgrind/html/quick-start.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/quick-start.html rename to Inst/share/doc/valgrind/html/quick-start.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/sg-manual.html b/Inst/share/doc/valgrind/html/sg-manual.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/sg-manual.html rename to Inst/share/doc/valgrind/html/sg-manual.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/tech-docs.html b/Inst/share/doc/valgrind/html/tech-docs.html similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/tech-docs.html rename to Inst/share/doc/valgrind/html/tech-docs.html diff --git a/Inst/data/local/Inst/share/doc/valgrind/html/vg_basic.css b/Inst/share/doc/valgrind/html/vg_basic.css similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/html/vg_basic.css rename to Inst/share/doc/valgrind/html/vg_basic.css diff --git a/Inst/data/local/Inst/share/doc/valgrind/valgrind_manual.pdf b/Inst/share/doc/valgrind/valgrind_manual.pdf similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/valgrind_manual.pdf rename to Inst/share/doc/valgrind/valgrind_manual.pdf diff --git a/Inst/data/local/Inst/share/doc/valgrind/valgrind_manual.ps b/Inst/share/doc/valgrind/valgrind_manual.ps similarity index 100% rename from Inst/data/local/Inst/share/doc/valgrind/valgrind_manual.ps rename to Inst/share/doc/valgrind/valgrind_manual.ps diff --git a/Inst/data/local/Inst/share/man/man1/callgrind_annotate.1 b/Inst/share/man/man1/callgrind_annotate.1 similarity index 100% rename from Inst/data/local/Inst/share/man/man1/callgrind_annotate.1 rename to Inst/share/man/man1/callgrind_annotate.1 diff --git a/Inst/data/local/Inst/share/man/man1/callgrind_control.1 b/Inst/share/man/man1/callgrind_control.1 similarity index 100% rename from Inst/data/local/Inst/share/man/man1/callgrind_control.1 rename to Inst/share/man/man1/callgrind_control.1 diff --git a/Inst/data/local/Inst/share/man/man1/cg_annotate.1 b/Inst/share/man/man1/cg_annotate.1 similarity index 100% rename from Inst/data/local/Inst/share/man/man1/cg_annotate.1 rename to Inst/share/man/man1/cg_annotate.1 diff --git a/Inst/data/local/Inst/share/man/man1/cg_diff.1 b/Inst/share/man/man1/cg_diff.1 similarity index 100% rename from Inst/data/local/Inst/share/man/man1/cg_diff.1 rename to Inst/share/man/man1/cg_diff.1 diff --git a/Inst/data/local/Inst/share/man/man1/cg_merge.1 b/Inst/share/man/man1/cg_merge.1 similarity index 100% rename from Inst/data/local/Inst/share/man/man1/cg_merge.1 rename to Inst/share/man/man1/cg_merge.1 diff --git a/Inst/data/local/Inst/share/man/man1/ms_print.1 b/Inst/share/man/man1/ms_print.1 similarity index 100% rename from Inst/data/local/Inst/share/man/man1/ms_print.1 rename to Inst/share/man/man1/ms_print.1 diff --git a/Inst/data/local/Inst/share/man/man1/valgrind-listener.1 b/Inst/share/man/man1/valgrind-listener.1 similarity index 100% rename from Inst/data/local/Inst/share/man/man1/valgrind-listener.1 rename to Inst/share/man/man1/valgrind-listener.1 diff --git a/Inst/data/local/Inst/share/man/man1/valgrind.1 b/Inst/share/man/man1/valgrind.1 similarity index 100% rename from Inst/data/local/Inst/share/man/man1/valgrind.1 rename to Inst/share/man/man1/valgrind.1 diff --git a/Inst/data/local/Inst/share/man/man1/vgdb.1 b/Inst/share/man/man1/vgdb.1 similarity index 100% rename from Inst/data/local/Inst/share/man/man1/vgdb.1 rename to Inst/share/man/man1/vgdb.1 diff --git a/README.md b/README.md index 2d81f66..fae28fd 100644 --- a/README.md +++ b/README.md @@ -12,31 +12,27 @@ Instructions for automatically detect memory management, threading bugs and prof $ ./install_android_valgrind.sh -4. Copy and start the specific package with Valgrind in the device +4. Copy and start the specific package with Valgrind on the device - $ ./bootstrap_valgrind.sh + $ ./start_valgrind.sh [app package name] NOTES: - - You need to change the "PACKAGE" to your package name in both 2 script files: bootstrap_valgrind.sh and start_valgrind.sh + - Change the activity to run at launch with `-a [ActivityName]` - - Change the output file path name from the script start_valgrind.sh + - Change the log output path on the Android device with `-l [path]`. They are saved to /sdcard/profiles by default. - - Change to use Callgrind or Memcheck tools from the script start_valgrind.sh + - Change the Valgrind tool with `-t [toolname]`, where toolname is one of: - - Change a tool from the script start_valgrind.sh + `memcheck`: a memory error detector - Memcheck tool: a memory error detector + `massif`: a heap profiler - Massif tool: a heap profiler + `callgrind`: a cache and branch-prediction profiler - Callgrind tool: a cache and branch-prediction profiler + `helgrind`: a thread error detector - Helgrind tool: a thread error detector - - DHAT: a dynamic heap analysis tool - - The log files of the example will be created at /sdcard/enzo_lync_profiles on the Android device. + `dhat`: a dynamic heap analysis tool 5. See outputs @@ -62,7 +58,7 @@ Instructions for automatically detect memory management, threading bugs and prof $ adb shell "top | grep valgrind" - All applications will run very slowly when valgrind service is running so you need to restart device to refresh the device. Or you can stop the Valgrind and reset property by using the following command: + Valgrind will be terminated when `./start_valgrind.sh` is stopped, but it can otherwise be removed from the app by removing the wrap property and killing the Valgrind process: $ adb shell "setprop wrap.[PACKAGE] ''" diff --git a/bootstrap_valgrind.sh b/bootstrap_valgrind.sh deleted file mode 100755 index b541f62..0000000 --- a/bootstrap_valgrind.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -# Define the package name -PACKAGE="com.harman.lync" - -adb push start_valgrind.sh /data/local/ -adb shell chmod 777 /data/local/start_valgrind.sh - -adb root -adb shell "setprop wrap.com.harman.lync 'logwrapper /data/local/start_valgrind.sh'" -echo "wrap.$PACKAGE: $(adb shell getprop wrap.$PACKAGE)" - -adb shell am force-stop $PACKAGE -adb shell am start -a android.intent.action.MAIN -n $PACKAGE/.MainActivity - -adb logcat -c -adb logcat - -exit 0 \ No newline at end of file diff --git a/install_android_valgrind.sh b/install_android_valgrind.sh index e6882c3..37c3721 100755 --- a/install_android_valgrind.sh +++ b/install_android_valgrind.sh @@ -1,17 +1,17 @@ -#!/usr/bin/env bash +#!/bin/bash +set -e # Push local Valgrind installtion to the phone (if it exists, just overwrite it) -#if [[ $(adb shell ls -ld /data/local/Inst/bin/valgrind) = *"No such file or directory"* ]]; -#then - adb root - adb remount - adb shell "[ ! -d /data/local/Inst ] && mkdir /data/local/Inst" - adb push Inst / - adb shell "ls -l /data/local/Inst" +adb root +adb remount +adb shell "[ ! -d /data/local/Inst ] && mkdir /data/local/Inst" +adb push Inst /data/local/ - # Ensure Valgrind on the phone is running - adb shell "/data/local/Inst/bin/valgrind --version" +# Ensure Valgrind on the phone is running +adb shell "/data/local/Inst/bin/valgrind --version" + +# Add Valgrind executable to PATH (this might fail and indeed it fails..) +adb shell "export PATH=$PATH:/data/local/Inst/bin/" + +echo "Valgind successfully installed" - # Add Valgrind executable to PATH (this might fail and indeed it fails..) - adb shell "export PATH=$PATH:/data/local/Inst/bin/" -#fi \ No newline at end of file diff --git a/start_valgrind.sh b/start_valgrind.sh index 11038a4..ba06510 100755 --- a/start_valgrind.sh +++ b/start_valgrind.sh @@ -1,28 +1,110 @@ -#!/system/bin/sh +#!/bin/bash +set -e -# http://valgrind.org/docs/manual +unset PACKAGE +unset ACTIVITY +unset LOG +TOOL="memcheck" -# Define the package name -PACKAGE="com.harman.lync" +show_help() { + echo "Usage: ./start_valgrind.sh [options] package_name" + echo " package_name: the package name of the app (e.g. com.example)" + echo " options:" + echo " -a The activity to run (e.g. MainActivity)." + echo " -h Display this help message." + echo " -l Where to store the Valgrind log" + echo " (default = /sdcard/profiles/package_name.tool.%p)" + echo " -t Valgrind tool to use (default = memcheck)." +} -# Create a directory to save the file outputs -mkdir -p /sdcard/enzo_lync_profiles +while getopts "ha:l:t:" opt; do + case ${opt} in + a ) + ACTIVITY="$OPTARG" + ;; + h ) + show_help + exit 0 + ;; + l ) + LOG="$OPTARG" + ;; + t ) + TOOL="$OPTARG" + ;; + \? ) + echo "Invalid Option: -$OPTARG" 1>&2 + exit 1 + ;; + esac +done +shift $((OPTIND -1)) -# Memcheck tool: a memory error detector -VGPARAMS='-v --error-limit=no --trace-children=yes --log-file=/sdcard/enzo_lync_profiles/enzo_lync_profile.log.%p --tool=memcheck --leak-check=full --show-reachable=yes' +PACKAGE=$1 -# Massif tool: a heap profiler -# VGPARAMS='-v --error-limit=no --trace-children=yes --log-file=/sdcard/enzo_lync_profiles/enzo_lync_profile.log.%p --tool=massif --massif-out-file=/sdcard/enzo_lync_profiles/enzo_lync_profile.massif.out.%p' +if [ "x$PACKAGE" = "x" ]; then + show_help + exit 1 +fi -# Callgrind tool: a cache and branch-prediction profiler -# VGPARAMS='-v --error-limit=no --trace-children=yes --log-file=/sdcard/enzo_lync_profiles/enzo_lync_profile.log.%p --tool=callgrind --callgrind-out-file=/sdcard/enzo_lync_profiles/enzo_lync_profile.callgrind.out.%p' +if [ -z $LOG ]; then + LOG="/sdcard/profiles/$PACKAGE.$TOOL.%p" +fi -# Helgrind tool: a thread error detector -# VGPARAMS='-v --error-limit=no --trace-children=yes --log-file=/sdcard/enzo_lync_profiles/enzo_lync_profile.log.%p --tool=helgrind --helgrind-out-file=/sdcard/enzo_lync_profiles/enzo_lync_profile.helgrind.out.%p' +wrapper_temp=".valgrind_wrapper.$PACKAGE.sh" +sed -e "s:%PACKAGE%:$PACKAGE:" -e "s:%LOG%:$LOG:" -e "s:%TOOL%:$TOOL:" valgrind_wrapper.template.sh > "$wrapper_temp" -# DHAT: a dynamic heap analysis tool -# VGPARAMS='-v --error-limit=no --trace-children=yes --log-file=/sdcard/enzo_lync_profiles/enzo_lync_profile.log.%p --tool=exp-dhat --exp-dhat-out-file=/sdcard/enzo_lync_profiles/enzo_lync_profile.dhat.out.%p' +adb root -export TMPDIR=/data/data/$PACKAGE +wrapper_file="/data/local/tmp/valgrind_wrapper.sh" +adb shell "mkdir -p $wrapper_file" +adb push "$wrapper_temp" "$wrapper_file" +rm $wrapper_temp + +adb shell "chmod 0777 $wrapper_file" +adb shell "setprop wrap.$PACKAGE 'logwrapper $wrapper_file'" + +echo "wrap.$PACKAGE: $(adb shell getprop wrap.$PACKAGE)" + +adb shell am force-stop $PACKAGE + +if [ -z $ACTIVITY ]; then + adb shell "monkey -p $PACKAGE -c android.intent.category.LAUNCHER 1" >/dev/null +else + adb shell "am start -a android.intent.action.MAIN -n $PACKAGE/.$ACTIVITY" >/dev/null +fi + +adb shell "setprop wrap.$PACKAGE ''" +adb shell "rm -f $wrapper_file" + +echo "" +echo "Valgrind is now profiling $PACKAGE" +echo "You may disconnect your device" +echo "" +echo "Use Ctrl + C to stop" + +trap handle_interrupt INT + +adb logcat -c +sleep 3 + +adb logcat & +logcat_pid=$! + +handle_interrupt() { + kill $logcat_pid 2>/dev/null || true + + echo "" + if adb get-state 1>/dev/null 2>&1; then + adb shell "am force-stop $PACKAGE" + echo "" + echo "Valgrind has stopped" + echo "The log has been saved to $LOG" + exit 0 + else + echo "No device connected, reconnect to terminate the app" + fi +} + +read -r -d '' _ -exec /data/local/Inst/bin/valgrind $VGPARAMS $* \ No newline at end of file diff --git a/valgrind_wrapper.template.sh b/valgrind_wrapper.template.sh new file mode 100755 index 0000000..657324a --- /dev/null +++ b/valgrind_wrapper.template.sh @@ -0,0 +1,19 @@ +#!/system/bin/sh + +PACKAGE="%PACKAGE%" +LOG="%LOG%" +TOOL="%TOOL%" + +echo "----- Running $PACKAGE with Valgrind" + +# Create a directory to save the file outputs +mkdir -p $LOG + +echo "----- Saving log to $LOG" + +# http://valgrind.org/docs/manual +VGPARAMS="-v --error-limit=no --trace-children=yes --log-file=$LOG --tool=$TOOL --leak-check=full --show-reachable=yes" + +export TMPDIR="/data/data/$PACKAGE" +exec /data/local/Inst/bin/valgrind $VGPARAMS $* +