From 0511558771ed85dabc471d9e1247a6c1594b8dfe Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 19 Mar 2020 15:29:43 +0000
Subject: [PATCH] Compile service-statsd against the system server SDK

This ensures this jar doesn't link against any non-sdk jars,
and hides the implementation names of the actual stub jars.

Bug: 146757305
Test: m
Change-Id: Ia80ada60acd9b059f566dec349ac1c4308298fd1
---
 apex/statsd/service/Android.bp | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/apex/statsd/service/Android.bp b/apex/statsd/service/Android.bp
index d5c16a6e9e5a5..df0ccfc54d648 100644
--- a/apex/statsd/service/Android.bp
+++ b/apex/statsd/service/Android.bp
@@ -21,28 +21,13 @@ filegroup {
 
 java_library {
     name: "service-statsd",
-    installable: true,
-
-    srcs: [
-        ":service-statsd-sources",
-    ],
-
-    // TODO(b/146757305) should be "module_current" since not allowed to use
-    // @CorePlatformApi's
-    sdk_version: "core_platform",
-
+    srcs: [ ":service-statsd-sources" ],
+    sdk_version: "system_server_current",
     libs: [
         "framework-annotations-lib",
-        "services-stubs",
         "framework-statsd",
-
-        // TODO(b/146757305): should be unnecessary once
-        // sdk_version="module_lib_current" or "module_current"
-        "android_module_lib_stubs_current",
     ],
-
     plugins: ["java_api_finder"],
-
     apex_available: [
         "com.android.os.statsd",
         "test_com.android.os.statsd",