commit f314a273ba650a098d92c914397aafe497dac9db
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 28 08:56:00 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 28 08:56:00 2020 +0000
tree 30bab073ccb222e23306e397015cb89d18e2491e
parent 681ddf13c27e46c4e6101480a6487d6ce5a03459
parent 6c50ab027108e64919c484e17759d8d6cd39b88f

Merge "Make libstatssocket shared" into rvc-dev

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 4c96263..2df3eea 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -32,6 +32,7 @@
     compile_multilib: "both",
     prebuilts: ["com.android.os.statsd.init.rc"],
     name: "com.android.os.statsd-defaults",
+    updatable: true,
     key: "com.android.os.statsd.key",
     certificate: ":com.android.os.statsd.certificate",
 }

apex/framework/Android.bp

diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp
index 0f52f15..1bd770a 100644
--- a/apex/framework/Android.bp
+++ b/apex/framework/Android.bp
@@ -69,6 +69,8 @@
         "android.util",
     ],
 
+    plugins: ["java_api_finder"],
+
     hostdex: true, // for hiddenapi check
     visibility: [
         "//frameworks/base/apex/statsd:__subpackages__",

apex/service/Android.bp

diff --git a/apex/service/Android.bp b/apex/service/Android.bp
index 0f325e3..ff56bb5 100644
--- a/apex/service/Android.bp
+++ b/apex/service/Android.bp
@@ -31,6 +31,8 @@
         "android_module_lib_stubs_current",
     ],
 
+    plugins: ["java_api_finder"],
+
     apex_available: [
         "com.android.os.statsd",
         "test_com.android.os.statsd",