Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f3f7fe1 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Make protolog common srcs a library 

This is so that we can import the platform annotations (specifically for the ravenwood annotations) as the library instead of the sources directly which are not visibile at this level.

Flag: EXEMPT build rules only
Change-Id: Iad6e03cc5924ba94941a1737e7a5a3a6bff8e2f1
parent 81d7df2d

core/java/Android.bp

+14 −1
Original line number Diff line number Diff line
@@ -656,6 +656,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: [
@@ -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

libs/WindowManager/Shell/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -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",

tools/protologtool/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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",

    ],

}