From 29a86b034561ca4e73b8d11110a1acf43e3cb390 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 17 Mar 2020 17:52:03 +0000
Subject: 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/statsd/framework/Android.bp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 8185bb036b22..986682e6a8c9 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -166,10 +166,8 @@ java_library {
 
 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 @@ android_test {
     libs: [
         "android.test.runner.stubs",
         "android.test.base.stubs",
+        "framework-statsd",
     ],
     test_suites: [
         "device-tests",
-- 
cgit v1.2.3-59-g8ed1b