Stop building against core_platform where possible
This is not a stable API surface, so modules shouldn't be building
against it. Compiling against core_platform also disables link-checking,
which can hide other problems.
Bug: 137191822
Test: m
Change-Id: I7ce7dad8c02b094c565daf8c178bc6f89bb610ef
Merged-In: I7ce7dad8c02b094c565daf8c178bc6f89bb610ef
(cherry picked from commit 791551a70fce9267626bb39aa03af80e269e5506)
diff --git a/Android.bp b/Android.bp
index 1aaa604..e784546 100644
--- a/Android.bp
+++ b/Android.bp
@@ -608,7 +608,7 @@
java_library {
name: "framework-annotations-lib",
srcs: [ ":framework-annotations" ],
- sdk_version: "current",
+ sdk_version: "core_current",
}
filegroup {
@@ -739,7 +739,7 @@
"core/proto/android/privacy.proto",
"core/proto/android/section.proto",
],
- sdk_version: "current",
+ sdk_version: "9",
srcs: [
"core/proto/**/*.proto",
"libs/incident/proto/android/os/**/*.proto",
@@ -762,6 +762,7 @@
"core/proto/android/privacy.proto",
"core/proto/android/section.proto",
],
+ sdk_version: "core_current",
// Protos have lots of MissingOverride and similar.
errorprone: {
javacflags: ["-XepDisableAllChecks"],