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

Commit 1eaa1856 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Remove intermediate build rule that requires checked-in config file to be up to date 

We no longer need to check in these files and keep them up to date.

Change-Id: Ifa23c4c215f777bbfb6599851fb1c557e046da97
parent 7e337582

services/core/Android.bp

+2 −34
Original line number Diff line number Diff line
@@ -92,38 +92,6 @@ genrule { 
    out: ["core.protolog.pb"],

}



genrule {

    name: "checked-protolog.json",

    srcs: [

        ":generate-protolog.json",

        ":services.core.protolog.json",

    ],

    cmd: "cp $(location :generate-protolog.json) $(out) && " +

        "{ ! (diff $(out) $(location :services.core.protolog.json) | grep -q '^<') || " +

        "{ echo -e '\\n\\n################################################################\\n#\\n" +

        "#  ERROR: ProtoLog viewer config is stale.  To update it, run:\\n#\\n" +

        "#  cp $${ANDROID_BUILD_TOP}/$(location :generate-protolog.json) " +

        "$${ANDROID_BUILD_TOP}/$(location :services.core.protolog.json)\\n#\\n" +

        "################################################################\\n\\n' >&2 && false; } }",

    out: ["services.core.protolog.json"],

}



genrule {

    name: "checked-core.protolog.pb",

    srcs: [

        ":gen-core.protolog.pb",

        ":file-core.protolog.pb",

    ],

    cmd: "cp $(location :gen-core.protolog.pb) $(out) && " +

        "{ ! (diff $(out) $(location :file-core.protolog.pb) | grep -q '^<') || " +

        "{ echo -e '\\n\\n################################################################\\n#\\n" +

        "#  ERROR: ProtoLog viewer config is stale.  To update it, run:\\n#\\n" +

        "#  cp $${ANDROID_BUILD_TOP}/$(location :gen-core.protolog.pb) " +

        "$${ANDROID_BUILD_TOP}/$(location :file-core.protolog.pb)\\n#\\n" +

        "################################################################\\n\\n' >&2 && false; } }",

    out: ["core.protolog.pb"],

}



genrule {

    name: "statslog-art-java-gen",

    tools: ["stats-log-api-gen"],
@@ -303,7 +271,7 @@ prebuilt_etc { 


genrule {

    name: "services.core.json.gz",

    srcs: [":checked-protolog.json"],

    srcs: [":generate-protolog.json"],

    out: ["services.core.protolog.json.gz"],

    cmd: "gzip -c < $(in) > $(out)",

}
@@ -315,5 +283,5 @@ prebuilt_etc { 


prebuilt_etc {

    name: "core.protolog.pb",

    src: ":checked-core.protolog.pb",

    src: ":gen-core.protolog.pb",

}