Merge branch 'for-mainline' into 'master'
For mainline See merge request !43
This commit is contained in:
		
						commit
						e7e07bd03b
					
				@ -14,6 +14,7 @@ Once you have checked out the version you wish to build, run:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
git submodule update --init
 | 
					git submodule update --init
 | 
				
			||||||
 | 
					cd F-Droid
 | 
				
			||||||
./ant-prepare.sh # This runs 'android update' on the libs and the main project
 | 
					./ant-prepare.sh # This runs 'android update' on the libs and the main project
 | 
				
			||||||
ant clean release
 | 
					ant clean release
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
@ -97,7 +98,7 @@ $ android list targets
 | 
				
			|||||||
To get a list of targets used by fdroidclient libs, run:
 | 
					To get a list of targets used by fdroidclient libs, run:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
$ for i in $(grep "android update lib-project" ant-prepare.sh | cut -f5 -d' '); do
 | 
					$ for i in $(grep "android.library.reference" project.properties | cut -f2 -d'='); do
 | 
				
			||||||
grep ^target $i/project.properties | cut -f2 -d'=';
 | 
					grep ^target $i/project.properties | cut -f2 -d'=';
 | 
				
			||||||
done | sort | uniq | paste -s -d',' -
 | 
					done | sort | uniq | paste -s -d',' -
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user