diff --git a/.github/workflows/android-release-artifacts.yml b/.github/workflows/android-release-artifacts.yml index 6c89aac2ef7..3a64d876bca 100644 --- a/.github/workflows/android-release-artifacts.yml +++ b/.github/workflows/android-release-artifacts.yml @@ -38,7 +38,6 @@ jobs: if curl -I "https://ossci-android.s3.amazonaws.com/executorch/release/${VERSION}-${FLAVOR}/executorch.aar" | grep "200 OK"; then echo "AAR already exists at https://ossci-android.s3.amazonaws.com/executorch/release/${VERSION}-${FLAVOR}/executorch.aar" echo "Will skip build/upload" - exit 1 fi build-aar: @@ -90,6 +89,10 @@ jobs: fi FLAVOR="${{ inputs.flavor }}" + if [ ! -z "$FLAVOR" ]; then + GRADLE_ARGS+=" -Dflavor=${FLAVOR}" + fi + if [[ "$FLAVOR" == "vulkan" || -z "$FLAVOR" ]]; then curl -O https://sdk.lunarg.com/sdk/download/1.4.321.1/linux/vulkansdk-linux-x86_64-1.4.321.1.tar.xz tar xf vulkansdk-linux-x86_64-1.4.321.1.tar.xz -C /tmp diff --git a/extension/android/executorch_android/build.gradle b/extension/android/executorch_android/build.gradle index e36044e3da5..0c18d60721e 100644 --- a/extension/android/executorch_android/build.gradle +++ b/extension/android/executorch_android/build.gradle @@ -15,6 +15,7 @@ plugins { def qnnVersion = System.properties['qnnVersion'] def execuTorchVersion = System.properties['execuTorchVersion'] +def flavor = System.properties['flavor'] android { namespace = "org.pytorch.executorch" @@ -69,7 +70,7 @@ mavenPublishing { publishToMavenCentral() signAllPublications() - coordinates("org.pytorch", "executorch-android" + (qnnVersion ? "-qnn" : ""), execuTorchVersion ? execuTorchVersion : "0.7.0-SNAPSHOT") + coordinates("org.pytorch", "executorch-android" + (flavor ? "-" + flavor : ""), execuTorchVersion ? execuTorchVersion : "1.0.0-SNAPSHOT") pom { name = "ExecuTorch Android"