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

Commit ed5d871f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ibc430ec4,If2ccf4d5 into main 

* changes:
  Pandora: update linter file for BumbleBluetoothTests
  Pandora: add linter file for Pandora Server
parents d4ab76ec 2a954456

android/pandora/server/build.gradle.kts

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



// This build.gradle.kts file is solely for the purpose of satisfying the linter's requirements.

// The actual build process is handled by Soong via the Android.bp

plugins {

    // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.

    id("org.jetbrains.kotlin.jvm") version "1.8.20"



    // Apply the java-library plugin for API and implementation separation.

    `java-library`

}



repositories {

    // Use Maven Central for resolving dependencies.

    mavenCentral()

}



sourceSets.main {

    java {

        exclude("**/*.bp")

        srcDirs("src")

    }

}



val android_build_top = System.getenv("ANDROID_BUILD_TOP") ?: "../../../../../../"

val out = "${android_build_top}/out/soong/.intermediates"



dependencies {

    // Kotlin coroutines

    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")

    // Kotlin std

    implementation(files("$android_build_top/external/kotlinc/lib/kotlin-stdlib.jar"))

    // Android system SDK

    implementation(files("$android_build_top/prebuilts/sdk/33/system-server/android.jar"))

    // Framework Bluetooth

    implementation(files("$out/packages/modules/Bluetooth/framework/framework-bluetooth-pre-jarjar/android_common/turbine-combined/framework-bluetooth-pre-jarjar.jar"))

    // Pandora APIs

    implementation(files("$out/packages/modules/Bluetooth/pandora/interfaces/pandora-grpc-java/android_common/combined/pandora-grpc-java.jar"))

    implementation(files("$out/packages/modules/Bluetooth/pandora/interfaces/pandora-proto-java/android_common/combined/pandora-proto-java.jar"))

    // Androidx Test Core

    implementation(files("$out/prebuilts/misc/common/androidx-test/androidx.test.core/android_common/combined/androidx.test.core.jar"))

    // Protobuf

    implementation(files("$out/external/protobuf/libprotobuf-java-micro/android_common/turbine-combined/libprotobuf-java-micro.jar"))

}

android/pandora/server/kls-classpath

0 → 100755
+34 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright (C) 2024 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



if [ -n "${ANDROID_BUILD_TOP}" ]; then

    ANDROID_SOURCE_TREE="${ANDROID_BUILD_TOP}"

else

    ANDROID_SOURCE_TREE="$PWD/../../../../../../"

fi



OUT="${ANDROID_SOURCE_TREE}out/soong/.intermediates/"



CLASSPATH=""

CLASSPATH+="${ANDROID_SOURCE_TREE}external/kotlinc/lib/kotlin-stdlib.jar"

CLASSPATH+=":${ANDROID_SOURCE_TREE}prebuilts/sdk/33/system-server/android.jar"

CLASSPATH+=":${OUT}external/kotlinx.coroutines/kotlinx-coroutines-core/android_common/turbine-combined/kotlinx-coroutines-core.jar"

CLASSPATH+=":${OUT}packages/modules/Bluetooth/framework/framework-bluetooth-pre-jarjar/android_common/turbine-combined/framework-bluetooth-pre-jarjar.jar"

CLASSPATH+=":${OUT}packages/modules/Bluetooth/pandora/interfaces/pandora-grpc-java/android_common/turbine-combined/pandora-grpc-java.jar"

CLASSPATH+=":${OUT}packages/modules/Bluetooth/pandora/interfaces/pandora-proto-java/android_common/turbine-combined/pandora-proto-java.jar"

CLASSPATH+=":${OUT}prebuilts/misc/common/androidx-test/androidx.test.core/android_common/combined/androidx.test.core.jar"

CLASSPATH+=":${OUT}external/protobuf/libprotobuf-java-micro/android_common/turbine-combined/libprotobuf-java-micro.jar"



echo "$CLASSPATH"

framework/tests/bumble/build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ dependencies { 
    // Framework Bluetooth

    implementation(files("$out/packages/modules/Bluetooth/framework/framework-bluetooth-pre-jarjar/android_common/turbine-combined/framework-bluetooth-pre-jarjar.jar"))

    // Pandora APIs

    implementation(files("$out/packages/modules/Bluetooth/pandora/interfaces/pandora_experimental-grpc-java/android_common/combined/pandora_experimental-grpc-java.jar"))

    implementation(files("$out/packages/modules/Bluetooth/pandora/interfaces/pandora_experimental-proto-java/android_common/combined/pandora_experimental-proto-java.jar"))

    implementation(files("$out/packages/modules/Bluetooth/pandora/interfaces/pandora-grpc-java/android_common/combined/pandora-grpc-java.jar"))

    implementation(files("$out/packages/modules/Bluetooth/pandora/interfaces/pandora-proto-java/android_common/combined/pandora-proto-java.jar"))

    // Junit

    implementation(files("$out/external/junit/junit/android_common/turbine-combined/junit.jar"))

    // Truth

framework/tests/bumble/kls-classpath

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ CLASSPATH+="${ANDROID_SOURCE_TREE}external/kotlinc/lib/kotlin-stdlib.jar" 
CLASSPATH+=":${ANDROID_SOURCE_TREE}prebuilts/sdk/33/system-server/android.jar"

CLASSPATH+=":${OUT}external/kotlinx.coroutines/kotlinx-coroutines-core/android_common/turbine-combined/kotlinx-coroutines-core.jar"

CLASSPATH+=":${OUT}packages/modules/Bluetooth/framework/framework-bluetooth-pre-jarjar/android_common/turbine-combined/framework-bluetooth-pre-jarjar.jar"

CLASSPATH+=":${OUT}packages/modules/Bluetooth/pandora/interfaces/pandora_experimental-grpc-java/android_common/combined/pandora_experimental-grpc-java.jar"

CLASSPATH+=":${OUT}packages/modules/Bluetooth/pandora/interfaces/pandora_experimental-proto-java/android_common/combined/pandora_experimental-proto-java.jar"

CLASSPATH+=":${OUT}packages/modules/Bluetooth/pandora/interfaces/pandora-grpc-java/android_common/turbine-combined/pandora-grpc-java.jar"

CLASSPATH+=":${OUT}packages/modules/Bluetooth/pandora/interfaces/pandora-proto-java/android_common/turbine-combined/pandora-proto-java.jar"

CLASSPATH+=":${OUT}external/junit/junit/android_common/turbine-combined/junit.jar"

CLASSPATH+=":${OUT}external/truth/truth/android_common/turbine-combined/truth.jar"

CLASSPATH+=":${OUT}prebuilts/misc/common/androidx-test/androidx.test.core/android_common/combined/androidx.test.core.jar"