commit a21b20414fd3b71debd53f0bd6e09605a81b55e2
author Jiyong Park <jiyong@google.com> Mon Jan 06 16:35:49 2020 +0900
committer Muhammad Qureshi <muhammadq@google.com> Sat Feb 08 22:37:04 2020 -0800
tree 80e523a3f166bf13ac7b825008d920c66da00297
parent 8ea733e4351f634a55dcef5b33b3c3815e3b344b

Use framework-statsd-stubs in frameworks/base/Android.bp

The non-updatable part of the platform does not use framework-stats, but
framework-stats-stub. In doing so, some APIs in StatsEvent were made as
SystemApis.

FrameworkCoreTests was also modified to avoid the implicit linking with
'framework.jar' that doesn't have the test-only APIs for statsd. To
disable the implicit linking, sdk_version was set to core_platform and
the dependency to framework.jar was replaced with framework-all.

Bug: 146167933
Test: m
Test: m FrameworkCoreTests
Change-Id: Ic447993a13f74c09fabb04fe32b9b94d78a34ce2

Android.bp

diff --git a/Android.bp b/Android.bp
index 2dc8a4c..85c6672 100644
--- a/Android.bp
+++ b/Android.bp
@@ -458,7 +458,7 @@
     libs: [
         "framework-appsearch-stubs",
         "framework-sdkextensions-stubs-systemapi",
-        "framework-statsd", // TODO(b/146167933): Use framework-statsd-stubs
+        "framework-statsd-stubs-module_libs_api",
         "framework-permission-stubs-systemapi",
         "framework-wifi-stubs",
         "ike-stubs",
@@ -511,8 +511,7 @@
         "framework-mediaprovider-stubs-systemapi",
         "framework-permission-stubs-systemapi",
         "framework-sdkextensions-stubs-systemapi",
-        // TODO(b/146167933): Use framework-statsd-stubs instead.
-        "framework-statsd",
+        "framework-statsd-stubs-module_libs_api",
         "framework-wifi-stubs",
         "ike-stubs",
         "framework-tethering-stubs",