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

Commit 9b23494c authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge "Drop use of protobuf-gradle-plugin" into main

parents ec60e698 bd517305

motiontoollib/build.gradle

+4 −29
Original line number Diff line number Diff line 
plugins {

    id 'com.android.library'

    id 'org.jetbrains.kotlin.android'

    id 'com.google.protobuf'

}



final String PROTOS_DIR = "${ANDROID_TOP}/frameworks/libs/systemui/motiontoollib/src/com/android/app/motiontool/proto"



android {

    namespace = "com.android.app.motiontool"

    testNamespace = "com.android.app.motiontool.tests"
@@ -17,7 +14,6 @@ android { 
        main {

            java.srcDirs = ['src']

            manifest.srcFile 'AndroidManifest.xml'

            proto.srcDirs = ["${PROTOS_DIR}"]

        }

        androidTest {

            java.srcDirs = ["tests"]
@@ -32,32 +28,11 @@ android { 


dependencies {

    implementation "androidx.core:core:1.9.0"

    implementation "com.google.protobuf:protobuf-lite:${protobuf_lite_version}"

    implementation(project(":frameworks:libs:systemui:motiontoollib:motion_tool_proto"))

    implementation(project(":frameworks:libs:systemui:viewcapturelib:view_capture_proto"))



    api project(":ViewCaptureLib")

    androidTestImplementation project(':SharedTestLib')

    androidTestImplementation 'androidx.test.ext:junit:1.1.3'

    androidTestImplementation "androidx.test:rules:1.4.0"

}
 
 No newline at end of file
 


protobuf {

    // Configure the protoc executable

    protoc {

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

    }

    plugins {

        javalite {

            // The codegen for lite comes as a separate artifact

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

        }

    }

    generateProtoTasks {

        all().each { task ->

            task.builtins {

                remove java

            }

            task.plugins {

                javalite { }

            }

        }

    }

}

viewcapturelib/build.gradle

+1 −28
Original line number Diff line number Diff line 
plugins {

    id 'com.android.library'

    id 'org.jetbrains.kotlin.android'

    id 'com.google.protobuf'

}



final String PROTOS_DIR = "${ANDROID_TOP}/frameworks/libs/systemui/viewcapturelib/src/com/android/app/viewcapture/proto"



android {

    namespace = "com.android.app.viewcapture"

    testNamespace = "com.android.app.viewcapture.test"
@@ -17,7 +14,6 @@ android { 
        main {

            java.srcDirs = ['src']

            manifest.srcFile 'AndroidManifest.xml'

            proto.srcDirs = ["${PROTOS_DIR}"]

        }

        androidTest {

            java.srcDirs = ["tests"]
@@ -32,31 +28,8 @@ android { 


dependencies {

    implementation "androidx.core:core:1.9.0"

    implementation "com.google.protobuf:protobuf-lite:${protobuf_lite_version}"

    implementation project(":frameworks:libs:systemui:viewcapturelib:view_capture_proto")

    androidTestImplementation project(':SharedTestLib')

    androidTestImplementation 'androidx.test.ext:junit:1.1.3'

    androidTestImplementation "androidx.test:rules:1.4.0"

}
 


protobuf {

    // Configure the protoc executable

    protoc {

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

    }

    plugins {

        javalite {

            // The codegen for lite comes as a separate artifact

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

        }

    }

    generateProtoTasks {

        all().each { task ->

            task.builtins {

                remove java

            }

            task.plugins {

                javalite { }

            }

        }

    }

}
 
 No newline at end of file