mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 06:30:27 +03:00 
			
		
		
		
	Update NDK to r22 and add buildtools 30.0.3
This commit is contained in:
		
							parent
							
								
									330ca2319c
								
							
						
					
					
						commit
						c88a3f56a1
					
				
					 4 changed files with 7 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -12,6 +12,7 @@ ndk_paths:
 | 
			
		|||
  r19c: /home/vagrant/android-ndk/r19c
 | 
			
		||||
  r20b: /home/vagrant/android-ndk/r20b
 | 
			
		||||
  r21d: /home/vagrant/android-ndk/r21d
 | 
			
		||||
  r22: /home/vagrant/android-ndk/r22
 | 
			
		||||
 | 
			
		||||
java_paths:
 | 
			
		||||
  8: /usr/lib/jvm/java-8-openjdk-amd64
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@ if [ ! -e $NDK_BASE/r10e ]; then
 | 
			
		|||
    mv android-ndk-r10e r10e
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21d; do
 | 
			
		||||
for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21d r22; do
 | 
			
		||||
    if [ ! -e ${NDK_BASE}/${version} ]; then
 | 
			
		||||
        unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
 | 
			
		||||
        mv android-ndk-${version} ${version}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,6 +22,7 @@
 | 
			
		|||
#   r19c: None
 | 
			
		||||
#   r20b: None
 | 
			
		||||
#   r21d: None
 | 
			
		||||
#   r22: None
 | 
			
		||||
 | 
			
		||||
# Directory to store downloaded tools in (i.e. gradle versions)
 | 
			
		||||
# By default, these are stored in ~/.cache/fdroidserver
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -279,6 +279,8 @@ CACHE_FILES = [
 | 
			
		|||
     '560eace2cc6ca16011fbb97c92c39aa0441d54dbfc13837dfbdb4a6bdf9c9da8'),
 | 
			
		||||
    ('https://dl.google.com/android/repository/build-tools_r30.0.2-linux.zip',
 | 
			
		||||
     '565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4'),
 | 
			
		||||
    ('https://dl.google.com/android/repository/build-tools_r30.0.3-linux.zip',
 | 
			
		||||
     '24593500aa95d2f99fb4f10658aae7e65cb519be6cd33fa164f15f27f3c4a2d6'),
 | 
			
		||||
    ('https://services.gradle.org/distributions/gradle-2.2.1-bin.zip',
 | 
			
		||||
     '420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'),
 | 
			
		||||
    ('https://services.gradle.org/distributions/gradle-2.3-bin.zip',
 | 
			
		||||
| 
						 | 
				
			
			@ -423,6 +425,8 @@ CACHE_FILES = [
 | 
			
		|||
     '8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c'),
 | 
			
		||||
    ('https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip',
 | 
			
		||||
     'dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd'),
 | 
			
		||||
    ('https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip',
 | 
			
		||||
     'd37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718'),
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue