commit 39f362f5041eb6345e759054688425ecca8fbba1
author Anton Hansson <hansson@google.com> Tue Mar 17 17:52:03 2020 +0000
committer Anton Hansson <hansson@google.com> Tue Mar 17 18:18:05 2020 +0000
tree f5c79e156f2ce4e0074a960523e0578a16835617
parent 308ad6c2c92b2e887e638fbaa63a0abd148834d8

Build FrameworkStatsdTest test against the sdk

The limitation that it couldn't both link against module_current
and use implementation details from statsd has been fixed.

Bug: 147705194
Test: m FrameworkStatsdTest
Change-Id: Ie0c87b07de935167e51ec741ac70df96e04a4ec2

apex/framework/Android.bp

diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp
index 8185bb0..986682e 100644
--- a/apex/framework/Android.bp
+++ b/apex/framework/Android.bp
@@ -166,10 +166,8 @@
 
 android_test {
     name: "FrameworkStatsdTest",
-    platform_apis: true,
+    sdk_version: "module_current",
     srcs: [
-        // TODO(b/147705194): Use framework-statsd as a lib dependency instead.
-        ":framework-statsd-sources",
         "test/**/*.java",
     ],
     manifest: "test/AndroidManifest.xml",
@@ -180,6 +178,7 @@
     libs: [
         "android.test.runner.stubs",
         "android.test.base.stubs",
+        "framework-statsd",
     ],
     test_suites: [
         "device-tests",