Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disable usage of plugins as static libs" into tm-mainline-prod

Browse Source
This commit is contained in:
Sam Delmerico
2022-09-13 13:21:07 +00:00
committed by Android (Google) Code Review
parent 4e62eeff57 78b25a9f84
commit 915d471cba
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/processors/intdef_mappings/Android.bp
View File

@@ -7,18 +7,24 @@ package {
default_applicable_licenses: ["frameworks_base_license"], default_applicable_licenses: ["frameworks_base_license"],
} }
java_library_host {
name: "libintdef-annotation-processor",
srcs: [
":framework-annotations",
"src/**/*.java",
"src/**/*.kt",
],
use_tools_jar: true,
}
java_plugin { java_plugin {
name: "intdef-annotation-processor", name: "intdef-annotation-processor",
processor_class: "android.processor.IntDefProcessor", processor_class: "android.processor.IntDefProcessor",
srcs: [ static_libs: ["libintdef-annotation-processor"],
":framework-annotations",
"src/**/*.java",
"src/**/*.kt"
],
use_tools_jar: true,
} }
java_test_host { java_test_host {
@@ -26,8 +32,8 @@ java_test_host {
srcs: [ srcs: [
"test/**/*.java", "test/**/*.java",
"test/**/*.kt" "test/**/*.kt",
], ],
java_resource_dirs: ["test/resources"], java_resource_dirs: ["test/resources"],
static_libs: [ static_libs: [
@@ -35,7 +41,7 @@ java_test_host {
"truth-prebuilt", "truth-prebuilt",
"junit", "junit",
"guava", "guava",
"intdef-annotation-processor" "libintdef-annotation-processor",
], ],
test_suites: ["general-tests"], test_suites: ["general-tests"],

18
tools/processors/view_inspector/Android.bp
View File

@@ -7,10 +7,8 @@ package {
default_applicable_licenses: ["frameworks_base_license"], default_applicable_licenses: ["frameworks_base_license"],
} }
java_plugin { java_library_host {
name: "view-inspector-annotation-processor", name: "libview-inspector-annotation-processor",
processor_class: "android.processor.view.inspector.PlatformInspectableProcessor",
srcs: ["src/java/**/*.java"], srcs: ["src/java/**/*.java"],
java_resource_dirs: ["src/resources"], java_resource_dirs: ["src/resources"],
@@ -23,6 +21,16 @@ java_plugin {
use_tools_jar: true, use_tools_jar: true,
} }
java_plugin {
name: "view-inspector-annotation-processor",
processor_class: "android.processor.view.inspector.PlatformInspectableProcessor",
static_libs: [
"libview-inspector-annotation-processor",
],
}
java_test_host { java_test_host {
name: "view-inspector-annotation-processor-test", name: "view-inspector-annotation-processor-test",
@@ -32,7 +40,7 @@ java_test_host {
static_libs: [ static_libs: [
"junit", "junit",
"guava", "guava",
"view-inspector-annotation-processor" "libview-inspector-annotation-processor",
], ],
test_suites: ["general-tests"], test_suites: ["general-tests"],