From 4250c894c69147c847509c64ec86373649767756 Mon Sep 17 00:00:00 2001
From: Tej Singh <singhtejinder@google.com>
Date: Wed, 18 Mar 2020 23:06:39 +0000
Subject: [PATCH] Revert "Build FrameworkStatsdTest test against the sdk"

This reverts commit 29a86b034561ca4e73b8d11110a1acf43e3cb390.

Reason for revert: b/151868293. Seems like there still might be a runtime issue with accessing the implemetation details?
Bug: 151868293

Change-Id: I0cdeaa057a768e99141793758c7d71a3d18c87f7
---
 apex/statsd/framework/Android.bp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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