frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-21 05:34:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert D22118971: [android] gradle version update

Browse Source 
Test Plan: revert-hammer

Differential Revision:
D22118971 (262ad8e6ab)

Original commit changeset: 566e45e8f6f7

fbshipit-source-id: 74cfec0c978b724d84460a6d0c98f97b389811f7
This commit is contained in:
Nikita Shulga
2020-06-19 08:46:50 -07:00
committed by Facebook GitHub Bot
parent b0324a97f5
commit a11870b45d
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/docker/build.sh
View File

@ -139,7 +139,7 @@ case "$image" in
PROTOBUF=yes PROTOBUF=yes
ANDROID=yes ANDROID=yes
ANDROID_NDK_VERSION=r19c ANDROID_NDK_VERSION=r19c
GRADLE_VERSION=6.5 GRADLE_VERSION=4.10.3
CMAKE_VERSION=3.7.0 CMAKE_VERSION=3.7.0
NINJA_VERSION=1.9.0 NINJA_VERSION=1.9.0
;; ;;

2
.circleci/scripts/build_android_gradle.sh
View File

@ -6,7 +6,7 @@ export ANDROID_HOME=/opt/android/sdk
# Must be in sync with GRADLE_VERSION in docker image for android # Must be in sync with GRADLE_VERSION in docker image for android
# https://github.com/pietern/pytorch-dockerfiles/blob/master/build.sh#L155 # https://github.com/pietern/pytorch-dockerfiles/blob/master/build.sh#L155
export GRADLE_VERSION=6.5 export GRADLE_VERSION=4.10.3
export GRADLE_HOME=/opt/gradle/gradle-$GRADLE_VERSION export GRADLE_HOME=/opt/gradle/gradle-$GRADLE_VERSION
export GRADLE_PATH=$GRADLE_HOME/bin/gradle export GRADLE_PATH=$GRADLE_HOME/bin/gradle

2
android/build.gradle
View File

@ -25,7 +25,7 @@ allprojects {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.2.0-alpha01' classpath 'com.android.tools.build:gradle:3.3.2'
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${GRADLE_BINTRAY_PLUGIN_VERSION}" classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${GRADLE_BINTRAY_PLUGIN_VERSION}"
classpath "com.github.dcendents:android-maven-gradle-plugin:${ANDROID_MAVEN_GRADLE_PLUGIN_VERSION}" classpath "com.github.dcendents:android-maven-gradle-plugin:${ANDROID_MAVEN_GRADLE_PLUGIN_VERSION}"
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8" classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8"

2
android/test_app/app/build.gradle
View File

@ -66,7 +66,7 @@ android {
} }
resnet18 { resnet18 {
dimension "model" dimension "model"
applicationIdSuffix ".resnet18" applicationIdSuffix ".resneti18"
buildConfigField("String", "MODULE_ASSET_NAME", "\"resnet18.pt\"") buildConfigField("String", "MODULE_ASSET_NAME", "\"resnet18.pt\"")
addManifestPlaceholders([APP_NAME: "RN18"]) addManifestPlaceholders([APP_NAME: "RN18"])
buildConfigField("String", "LOGCAT_TAG", "\"pytorch-resnet18\"") buildConfigField("String", "LOGCAT_TAG", "\"pytorch-resnet18\"")

4
scripts/build_pytorch_android.sh
View File

@ -41,7 +41,9 @@ build_android
# systemProp.https.proxyPort=8080 # systemProp.https.proxyPort=8080
if [ "$CUSTOM_ABIS_LIST" = true ]; then if [ "$CUSTOM_ABIS_LIST" = true ]; then
$GRADLE_PATH -PABI_FILTERS=$ABIS_LIST -p $PYTORCH_ANDROID_DIR clean assembleRelease # Skipping clean task here as android gradle plugin 3.3.2 exteralNativeBuild has problems
# with it when abiFilters are specified.
$GRADLE_PATH -PABI_FILTERS=$ABIS_LIST -p $PYTORCH_ANDROID_DIR assembleRelease
else else
$GRADLE_PATH -p $PYTORCH_ANDROID_DIR clean assembleRelease $GRADLE_PATH -p $PYTORCH_ANDROID_DIR clean assembleRelease
fi fi