rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

makefile: fall-back to android dx in the PATH

Browse Source
This commit is contained in:
Stacey Sheldon 2012-10-10 01:10:53 -04:00
parent 5314d9ad54
commit 201ee521d6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -486,9 +486,11 @@ endif
ifeq ($(shell [ -d "$(ANDROID_SDK_DIR)" ] && echo "exists"), exists) ifeq ($(shell [ -d "$(ANDROID_SDK_DIR)" ] && echo "exists"), exists)
ANDROID := $(ANDROID_SDK_DIR)/tools/android ANDROID := $(ANDROID_SDK_DIR)/tools/android
ANDROID_DX := $(ANDROID_SDK_DIR)/platform-tools/dx
else else
# not installed, hope it's in the path... # not installed, hope it's in the path...
ANDROID ?= android ANDROID ?= android
ANDROID_DX ?= dx
endif endif
############################## ##############################
@ -670,7 +672,7 @@ $$(UAVO_COLLECTION_DIR)/$(1)/uavohash/java-build/uavobjects.jar: $$(UAVO_COLLECT
-d . && \ -d . && \
find ./org/openpilot/uavtalk/uavobjects -type f -name '*.class' > classlist.txt && \ find ./org/openpilot/uavtalk/uavobjects -type f -name '*.class' > classlist.txt && \
jar cf tmp_uavobjects.jar @classlist.txt && \ jar cf tmp_uavobjects.jar @classlist.txt && \
$$(ANDROID_SDK_DIR)/platform-tools/dx \ $$(ANDROID_DX) \
--dex \ --dex \
--output $$(ANDROIDGCS_ASSETS_DIR)/uavos/$$$${HASH}.jar \ --output $$(ANDROIDGCS_ASSETS_DIR)/uavos/$$$${HASH}.jar \
tmp_uavobjects.jar && \ tmp_uavobjects.jar && \