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

Commit dabea20f authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Sysui gradle project uses protobuf versions that support reserved keyword" into main

parents 914f3ef9 c8eb6679

motiontoollib/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ protobuf { 
    plugins {

        javalite {

            // The codegen for lite comes as a separate artifact

            artifact = "com.google.protobuf:protoc-gen-javalite:${protobuf_version}${PROTO_ARCH_SUFFIX}"

            artifact = "com.google.protobuf:protoc-gen-javalite:${protobuf_lite_version}${PROTO_ARCH_SUFFIX}"

        }

    }

    generateProtoTasks {

viewcapturelib/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ protobuf { 
    plugins {

        javalite {

            // The codegen for lite comes as a separate artifact

            artifact = "com.google.protobuf:protoc-gen-javalite:${protobuf_version}${PROTO_ARCH_SUFFIX}"

            artifact = "com.google.protobuf:protoc-gen-javalite:${protobuf_lite_version}${PROTO_ARCH_SUFFIX}"

        }

    }

    generateProtoTasks {