summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anna Trostanetski <atrost@google.com> 2019-08-21 04:34:47 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-21 04:34:47 -0700
commit63331825479f90e69b2441773be67d4f396250eb (patch)
tree50fe374ec264d437b59f0d11c11b18a9c1edbed5
parent2fc30b6e6e2f554b69cec93f06ec1368684a0077 (diff)
parent8c41982cbef3bd3329267fe8d8eef0205ba6c553 (diff)
Merge "Add a platform-compat-config to the framework services." am: 6162efbfa7 am: 8ee5669a5e
am: 8c41982cbe Change-Id: Ifeba9db6e75208b1d4d2cb82987f790355a5a2d9
-rw-r--r--Android.bp1
-rw-r--r--services/Android.bp10
2 files changed, 11 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index bc72e9ae7164..3eff13d3e1a6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -263,6 +263,7 @@ java_library {
required: [
"framework-platform-compat-config",
"libcore-platform-compat-config",
+ "services-platform-compat-config",
],
}
diff --git a/services/Android.bp b/services/Android.bp
index b08d1a8095db..702cfeec7334 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -42,6 +42,10 @@ java_library {
"android.hidl.manager-V1.0-java",
],
+ plugins: [
+ "compat-changeid-annotation-processor",
+ ],
+
// Uncomment to enable output of certain warnings (deprecated, unchecked)
//javacflags: ["-Xlint"],
@@ -55,3 +59,9 @@ cc_library_shared {
defaults: ["libservices.core-libs"],
whole_static_libs: ["libservices.core"],
}
+
+platform_compat_config {
+ name: "services-platform-compat-config",
+ prefix: "services",
+ src: ":services",
+}