diff options
| author | 2025-03-19 08:02:08 -0700 | |
|---|---|---|
| committer | 2025-03-19 08:02:08 -0700 | |
| commit | 80cf43c3b1f0f9463b7af4426691bf04823963d7 (patch) | |
| tree | 96eaa0b4ccc4d7b82a8d1bf4e8853e25bc78c913 | |
| parent | d8fe23fa952b10603772774a91383cce7c44b183 (diff) | |
| parent | 0f3f7fe1173e389683f819ed5b69d2baa5540e2d (diff) | |
Merge "Make protolog common srcs a library" into main
| -rw-r--r-- | core/java/Android.bp | 15 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/Android.bp | 5 | ||||
| -rw-r--r-- | tools/protologtool/Android.bp | 2 |
3 files changed, 18 insertions, 4 deletions
diff --git a/core/java/Android.bp b/core/java/Android.bp index 22983d1af30b..7123ee7b5777 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -657,6 +657,17 @@ filegroup { } java_library { + name: "protolog-common-lib", + srcs: [ + ":protolog-common-src", + ], + host_supported: true, + static_libs: [ + "framework-annotations-lib", + ], +} + +java_library { name: "protolog-group", srcs: [ "com/android/internal/protolog/common/IProtoLogGroup.java", @@ -693,9 +704,11 @@ java_library { java_library { name: "protolog-groups", srcs: [ - ":protolog-common-src", "com/android/internal/protolog/WmProtoLogGroups.java", ], + static_libs: [ + "protolog-common-lib", + ], } // protolog end diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index 753212b8cdc9..033c934056d6 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -26,9 +26,11 @@ package { java_library { name: "wm_shell_protolog-groups", srcs: [ - ":protolog-common-src", "src/com/android/wm/shell/protolog/ShellProtoLogGroup.java", ], + static_libs: [ + "protolog-common-lib", + ], } filegroup { @@ -159,7 +161,6 @@ java_library { android_library { name: "WindowManager-Shell", srcs: [ - ":wm_shell_protolog_src", // TODO(b/168581922) protologtool do not support kotlin(*.kt) ":wm_shell-aidls", ":wm_shell-shared-aidls", diff --git a/tools/protologtool/Android.bp b/tools/protologtool/Android.bp index 46874c30284c..a103d03af3c3 100644 --- a/tools/protologtool/Android.bp +++ b/tools/protologtool/Android.bp @@ -10,7 +10,6 @@ package { java_library_host { name: "protologtool-lib", srcs: [ - ":protolog-common-src", "src/com/android/protolog/tool/**/*.kt", ], static_libs: [ @@ -18,6 +17,7 @@ java_library_host { "jsonlib", "perfetto_trace-full", "platformprotos", + "protolog-common-lib", ], } |