commit dbad1ef673140c66cdbcbbf40424674ae8e2b4c8
author Ulyana Trafimovich <skvadrik@google.com> Wed Feb 17 13:46:00 2021 +0000
committer Ulya Trafimovich <skvadrik@google.com> Wed Feb 17 16:45:59 2021 +0000
tree d1f1d2521aae7d28f0def5abaed2746e353d2162
parent 3dba023d4fb47882fa215715c196cfa3be30c098

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

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index 1f91093..4608af1 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -156,7 +156,7 @@
         "linear_alloc.cc",
         "managed_stack.cc",
         "method_handles.cc",
-        "metrics/reporter.cc",
+        "metrics_reporter.cc",
         "mirror/array.cc",
         "mirror/class.cc",
         "mirror/class_ext.cc",
@@ -365,17 +365,12 @@
                 "monitor_android.cc",
                 "runtime_android.cc",
                 "thread_android.cc",
-                "metrics/statsd.cc",
             ],
             shared_libs: [
                 "libdl_android",
                 "libicu",
-                "libstatssocket",
                 "libz", // For adler32.
             ],
-            static_libs: [
-                "libstatslog_art",
-            ],
         },
         android_arm: {
             ldflags: JIT_DEBUG_REGISTER_CODE_LDFLAGS,
@@ -865,41 +860,3 @@
     ],
     cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
 }
-
-cc_library_static {
-    name: "libstatslog_art",
-    generated_sources: ["statslog_art.cpp"],
-    generated_headers: ["statslog_art.h"],
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
-    export_generated_headers: ["statslog_art.h"],
-    shared_libs: [
-        "liblog",
-        "libstatssocket",
-        "libutils",
-    ],
-    apex_available: [
-        "com.android.art",
-        "com.android.art.debug",
-    ],
-}
-
-genrule {
-    name: "statslog_art.h",
-    tools: ["stats-log-api-gen"],
-    cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_art.h --module art --namespace art,metrics,statsd",
-    out: [
-        "statslog_art.h",
-    ],
-}
-
-genrule {
-    name: "statslog_art.cpp",
-    tools: ["stats-log-api-gen"],
-    cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_art.cpp --module art --namespace art,metrics,statsd --importHeader statslog_art.h",
-    out: [
-        "statslog_art.cpp",
-    ],
-}