Clean framework-aidl-export-defaults up
The defaults module specifies AIDL paths that are exported to the
clients of framework or framework-minus-apex libraries. Therefore, it
doesn't need to be inherited to framework-annotation-proc whose purpose
is just to run the annotation processor and isn't linked to anyone.
Also moved the 'required' property to the other defaults
'framework-defaults' since the property has nothing to do with exporting
aidl directories.
Bug: N/A
Test: m
Change-Id: Ied8522eec5c03d3162e6ae22a08e21f31dc528d2
diff --git a/Android.bp b/Android.bp
index 0e3d374..318d3b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -286,6 +286,8 @@
],
}
+// AIDL files under these paths are mixture of public and private ones.
+// They shouldn't be exported across module boundaries.
java_defaults {
name: "framework-aidl-export-defaults",
aidl: {
@@ -309,12 +311,6 @@
"wifi/java",
],
},
-
- required: [
- // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly.
- "gps_debug.conf",
- "protolog.conf.json.gz",
- ],
}
// Collection of classes that are generated from non-Java files that are not listed in
@@ -403,6 +399,12 @@
"view-inspector-annotation-processor",
"staledataclass-annotation-processor",
],
+
+ required: [
+ // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly.
+ "gps_debug.conf",
+ "protolog.conf.json.gz",
+ ],
}
filegroup {
@@ -528,7 +530,6 @@
java_library {
name: "framework-annotation-proc",
- defaults: ["framework-aidl-export-defaults"],
srcs: [":framework-all-sources"],
libs: [
"app-compat-annotations",