Move defaults closer to their targets
The top-level Android.bp is large and difficult to navigate. Move these
defaults closer to the targets that use them.
Bug: 185128417
Test: m
Change-Id: I7dd7a82837c9a0902aabd640e35ebb65c5f16c73
diff --git a/Android.bp b/Android.bp
index 06aa776..f3888ab 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,41 +14,6 @@
// Build the master framework library.
-// Defaults for platform code that runs inside system_server
-java_defaults {
- name: "platform_service_defaults",
- plugins: [
- "error_prone_android_framework",
- ],
- errorprone: {
- javacflags: [
- // "-Xep:AndroidFrameworkBinderIdentity:ERROR",
- "-Xep:AndroidFrameworkCompatChange:ERROR",
- // "-Xep:AndroidFrameworkUid:ERROR",
- // NOTE: only enable to generate local patchfiles
- // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster",
- // "-XepPatchLocation:/tmp/refaster/",
- ],
- },
-}
-
-// Defaults for platform apps
-java_defaults {
- name: "platform_app_defaults",
- plugins: [
- "error_prone_android_framework",
- ],
- errorprone: {
- javacflags: [
- // We're less worried about performance in app code
- "-Xep:AndroidFrameworkEfficientCollections:OFF",
- "-Xep:AndroidFrameworkEfficientParcelable:OFF",
- "-Xep:AndroidFrameworkEfficientStrings:OFF",
- "-Xep:AndroidFrameworkEfficientXml:OFF",
- ],
- },
-}
-
// READ ME: ########################################################
//
// When updating this list of aidl files, consider if that aidl is
diff --git a/packages/Android.bp b/packages/Android.bp
new file mode 100644
index 0000000..8b0698b
--- /dev/null
+++ b/packages/Android.bp
@@ -0,0 +1,28 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Defaults for platform apps
+java_defaults {
+ name: "platform_app_defaults",
+ plugins: ["error_prone_android_framework"],
+ errorprone: {
+ javacflags: [
+ // We're less worried about performance in app code
+ "-Xep:AndroidFrameworkEfficientCollections:OFF",
+ "-Xep:AndroidFrameworkEfficientParcelable:OFF",
+ "-Xep:AndroidFrameworkEfficientStrings:OFF",
+ "-Xep:AndroidFrameworkEfficientXml:OFF",
+ ],
+ },
+}
diff --git a/services/Android.bp b/services/Android.bp
index 25b270e..ad1406c 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -7,6 +7,22 @@
default_applicable_licenses: ["frameworks_base_license"],
}
+// Defaults for platform code that runs inside system_server
+java_defaults {
+ name: "platform_service_defaults",
+ plugins: ["error_prone_android_framework"],
+ errorprone: {
+ javacflags: [
+ // "-Xep:AndroidFrameworkBinderIdentity:ERROR",
+ "-Xep:AndroidFrameworkCompatChange:ERROR",
+ // "-Xep:AndroidFrameworkUid:ERROR",
+ // NOTE: only enable to generate local patchfiles
+ // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster",
+ // "-XepPatchLocation:/tmp/refaster/",
+ ],
+ },
+}
+
filegroup {
name: "services-main-sources",
srcs: [