commit 69c39b657b136b18e07515c152755efa4e105ae6
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 18 23:24:05 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 18 23:24:05 2020 +0000
tree 58515f97d93ebeaa7e940188693bde91e46948ee
parent 5a7ff821041728c53280897c28db919a7827df05
parent 6dc6dd8ab86d37d017fc7ca5a01f94ad77a677b9

Merge "Revert "Build FrameworkStatsdTest test against the sdk"" into rvc-dev

apex/framework/Android.bp

diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp
index 986682e..8185bb0 100644
--- a/apex/framework/Android.bp
+++ b/apex/framework/Android.bp
@@ -166,8 +166,10 @@
 
 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 @@
     libs: [
         "android.test.runner.stubs",
         "android.test.base.stubs",
-        "framework-statsd",
     ],
     test_suites: [
         "device-tests",