diff options
| author | Antoine Cellerier <dionoea@videolan.org> | 2011-01-24 17:06:04 +0000 |
|---|---|---|
| committer | Antoine Cellerier <dionoea@videolan.org> | 2011-01-24 17:06:04 +0000 |
| commit | a448d8bac7c97c008afcc0c435c7e9777c069b26 (patch) | |
| tree | 2b39ae642c661af0cf7ce9a90e9179ee10d67346 /tools | |
| parent | 9b02ce9e498e8c3580a25852c17345df710b4893 (diff) | |
| download | rockbox-a448d8bac7c97c008afcc0c435c7e9777c069b26.tar.gz rockbox-a448d8bac7c97c008afcc0c435c7e9777c069b26.zip | |
Android build tweaks.
Add make install target for android builds.
Remove standard install targets as they don't apply.
Add java compilation dependancy on generated resource class(es?) to prevent weird runtime issues.
Update installApk.sh script to use correct tool location in recent sdks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29131 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/root.make | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/root.make b/tools/root.make index cb7ab9620c..907d3928d4 100644 --- a/tools/root.make +++ b/tools/root.make | |||
| @@ -295,6 +295,7 @@ voice: voicetools $(BUILDDIR)/apps/features | |||
| 295 | 295 | ||
| 296 | endif | 296 | endif |
| 297 | 297 | ||
| 298 | ifeq (,$(findstring android, $(APP_TYPE))) | ||
| 298 | bininstall: $(BUILDDIR)/$(BINARY) | 299 | bininstall: $(BUILDDIR)/$(BINARY) |
| 299 | @echo "Installing your rockbox binary in your '$(RBPREFIX)' dir" | 300 | @echo "Installing your rockbox binary in your '$(RBPREFIX)' dir" |
| 300 | $(SILENT)cp $(BINARY) "$(RBPREFIX)/.rockbox/" | 301 | $(SILENT)cp $(BINARY) "$(RBPREFIX)/.rockbox/" |
| @@ -310,6 +311,7 @@ fullinstall: | |||
| 310 | symlinkinstall: | 311 | symlinkinstall: |
| 311 | @echo "Installing a full setup with links in your '$(RBPREFIX)' dir" | 312 | @echo "Installing a full setup with links in your '$(RBPREFIX)' dir" |
| 312 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) -l | 313 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) -l |
| 314 | endif | ||
| 313 | 315 | ||
| 314 | help: | 316 | help: |
| 315 | @echo "A few helpful make targets" | 317 | @echo "A few helpful make targets" |