mirror of
				https://github.com/ARM-software/workload-automation.git
				synced 2025-10-30 22:54:18 +00:00 
			
		
		
		
	Upgrade Gradle to 7.2 and Android Gradle plugin to 4.2.
The older versions of the plugin caused problems building with newer NDK versions due to a lack of MIPS support. This also required upgrading to a version of Gradle that knows about the Google Maven repository.
This commit is contained in:
		
				
					committed by
					
						 Marc Bonnici
						Marc Bonnici
					
				
			
			
				
	
			
			
			
						parent
						
							c023b9859c
						
					
				
				
					commit
					0b558e408c
				
			
										
											Binary file not shown.
										
									
								
							| @@ -14,7 +14,7 @@ android { | ||||
|     buildTypes { | ||||
|         applicationVariants.all { variant -> | ||||
|             variant.outputs.each { output -> | ||||
|                 output.outputFile = file("$project.buildDir/apk/${packageName}.apk") | ||||
|                 output.outputFileName = "${packageName}.apk" | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -3,9 +3,10 @@ | ||||
| buildscript { | ||||
|     repositories { | ||||
|         jcenter() | ||||
|         google() | ||||
|     } | ||||
|     dependencies { | ||||
|         classpath 'com.android.tools.build:gradle:2.3.1' | ||||
|         classpath 'com.android.tools.build:gradle:4.2.0' | ||||
|  | ||||
|         // NOTE: Do not place your application dependencies here; they belong | ||||
|         // in the individual module build.gradle files | ||||
| @@ -15,6 +16,7 @@ buildscript { | ||||
| allprojects { | ||||
|     repositories { | ||||
|         jcenter() | ||||
|         google() | ||||
|     } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -47,8 +47,8 @@ fi | ||||
| # If successful move APK file to workload folder (overwrite previous) | ||||
| package=com.arm.wa.uiauto.androbench | ||||
| rm -f ../$package | ||||
| if [[ -f app/build/apk/$package.apk ]]; then | ||||
|     cp app/build/apk/$package.apk ../$package.apk | ||||
| if [[ -f app/build/outputs/apk/debug/$package.apk ]]; then | ||||
|     cp app/build/outputs/apk/debug/$package.apk ../$package.apk | ||||
| else | ||||
|     echo 'ERROR: UiAutomator apk could not be found!' | ||||
|     exit 9 | ||||
|   | ||||
| @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME | ||||
| distributionPath=wrapper/dists | ||||
| zipStoreBase=GRADLE_USER_HOME | ||||
| zipStorePath=wrapper/dists | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip | ||||
|   | ||||
		Reference in New Issue
	
	Block a user