diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2021-02-17 13:46:00 +0000 |
|---|---|---|
| committer | Ulya Trafimovich <skvadrik@google.com> | 2021-02-17 16:45:59 +0000 |
| commit | dbad1ef673140c66cdbcbbf40424674ae8e2b4c8 (patch) | |
| tree | d1f1d2521aae7d28f0def5abaed2746e353d2162 /openjdkjvmti | |
| parent | 3dba023d4fb47882fa215715c196cfa3be30c098 (diff) | |
Revert "[metrics] Add StatsdBackend"
This reverts commit 3d2b93e6acb4e7ac6fc808f17813975f250dbf89.
Reason for revert: Breaks ART tests in chroot environment, as the
libstatssocket library is not found. The error message is:
CANNOT LINK EXECUTABLE
"/apex/com.android.art/bin/art/x86/art_libdexfile_tests":
library "libstatssocket.so" not found: needed by
/apex/com.android.art/lib/libartd.so in namespace com_android_art
How to reproduce in AOSP (e.g. on cuttlefish):
$ lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd
In another terminal, run art gtests on the device:
$ unset ART_TEST_ANDROID_ROOT
$ unset CUSTOM_TARGET_LINKER
$ unset ART_TEST_ANDROID_RUNTIME_ROOT
$ unset ART_TEST_ANDROID_TZDATA_ROOT
$
$ export ART_TEST_CHROOT=/data/local/art-test-chroot
$ export OVERRIDE_TARGET_FLATTEN_APEX=true
$ export ANDROID_SERIAL="0.0.0.0:6520"
$
$ . ./build/envsetup.sh
$ lunch aosp_cf_x86_64_phone-userdebug
$
$ art/tools/buildbot-build.sh --target -j72
$ art/tools/buildbot-cleanup-device.sh
$ art/tools/buildbot-setup-device.sh
$ art/tools/buildbot-sync.sh
$
$ export ISA=x86_64
$ art/tools/run-gtests.sh -j8
Bug: 178236337
Test: art gtests in chroot env on aosp_cf_x86_64_phone-userdebug
Change-Id: Icbd38792f4d8828c40a53f037cefeebd777172bf
Diffstat (limited to 'openjdkjvmti')
| -rw-r--r-- | openjdkjvmti/ti_thread.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openjdkjvmti/ti_thread.cc b/openjdkjvmti/ti_thread.cc index bb8fa3b694..c9e58094c4 100644 --- a/openjdkjvmti/ti_thread.cc +++ b/openjdkjvmti/ti_thread.cc @@ -45,7 +45,7 @@ #include "gc/system_weak.h" #include "gc_root-inl.h" #include "jni/jni_internal.h" -#include "metrics/reporter.h" +#include "metrics_reporter.h" #include "mirror/class.h" #include "mirror/object-inl.h" #include "mirror/string.h" |