Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move arm and armv7 libraries into armeabi-v7a jni folder.
  • Loading branch information
jpihl committed Apr 5, 2018
1 parent 759b864 commit 57920d6
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
4 changes: 3 additions & 1 deletion NEWS.rst
Expand Up @@ -6,7 +6,9 @@ every change, see the Git log.

Latest
------
* tbd
* Major: Upgrade to petro 11.
* Minor: Use gradle 4.4.
* Major: Move arm and armv7 libraries into armeabi-v7a jni folder.

7.0.0
-----
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.0'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.4.13"
}
}
Expand All @@ -25,8 +25,8 @@ allprojects {
}
}
project.ext {
compileSdkVersion = 26
targetSdkVersion = 26
compileSdkVersion = 27
targetSdkVersion = 27
}
buildDir = 'gradle_build'

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Sep 08 09:24:08 CEST 2017
#Thu Apr 05 12:15:32 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
2 changes: 1 addition & 1 deletion jni/wscript_build
Expand Up @@ -17,7 +17,7 @@ cpu = bld.env['DEST_CPU']
cpu_copy_path_map = {
'x86': 'x86',
'x86_64': 'x86_64',
'arm': 'armeabi',
'arm': 'armeabi-v7a',
'arm64': 'arm64-v8a',
# Unsupported
# 'armeabi-v7a': 'armeabi-v7a',
Expand Down
2 changes: 1 addition & 1 deletion resolve.json
Expand Up @@ -10,7 +10,7 @@
"name": "petro",
"resolver": "git",
"method": "semver",
"major": 9,
"major": 11,
"sources": ["github.com/steinwurf/petro.git"]
}
]

0 comments on commit 57920d6

Please sign in to comment.