atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] better android compilation

Browse Source
This commit is contained in:
Edouard DUPIN 2012-12-28 23:34:50 +01:00
parent d2180be4a6
commit b3962202f4
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile.Android.mk
View File

@ -197,7 +197,8 @@ final : javaclean $(FINAL_FILE_ABSTRACTION) $(TARGET_OUT_STAGING)/AndroidManifes
@# keytool is situated in $(JAVA_HOME)/bin ... @# keytool is situated in $(JAVA_HOME)/bin ...
@echo "apk(Signed) <== apk" @echo "apk(Signed) <== apk"
@#generate the pass file : ifeq ("$(DEBUG)","1")
@#generate the pass file (debug mode does not request to have a complicated key) :
@echo "Pass$(PROJECT_NAME2)" > tmpPass.boo @echo "Pass$(PROJECT_NAME2)" > tmpPass.boo
@echo "PassK$(PROJECT_NAME2)" >> tmpPass.boo @echo "PassK$(PROJECT_NAME2)" >> tmpPass.boo
@# verbose mode : -verbose @# verbose mode : -verbose
@ -205,9 +206,17 @@ final : javaclean $(FINAL_FILE_ABSTRACTION) $(TARGET_OUT_STAGING)/AndroidManifes
-keystore ./$(PROJECT_NAME2)-$(BUILD_DIRECTORY_MODE).jks \ -keystore ./$(PROJECT_NAME2)-$(BUILD_DIRECTORY_MODE).jks \
$(TARGET_OUT_STAGING)/build/$(PROJECT_NAME2)-unalligned.apk \ $(TARGET_OUT_STAGING)/build/$(PROJECT_NAME2)-unalligned.apk \
alias$(PROJECT_NAME2) \ alias$(PROJECT_NAME2) \
< tmpPass.boo < tmpPass.boo \
2> /dev/null
$(Q)rm tmpPass.boo $(Q)rm tmpPass.boo
else
@# sign the application request loggin and password :
$(Q)jarsigner \
-keystore ./$(PROJECT_NAME2)-$(BUILD_DIRECTORY_MODE).jks \
$(TARGET_OUT_STAGING)/build/$(PROJECT_NAME2)-unalligned.apk \
alias$(PROJECT_NAME2)
endif
@echo "apk(aligned) <== apk" @echo "apk(aligned) <== apk"
$(Q)rm -f $(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk $(Q)rm -f $(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk
@# verbose mode : -v @# verbose mode : -v
@ -216,8 +225,8 @@ final : javaclean $(FINAL_FILE_ABSTRACTION) $(TARGET_OUT_STAGING)/AndroidManifes
$(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk $(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk
@# copy file in the final stage : @# copy file in the final stage :
$(Q)mkdir -p $(TARGET_OUT_FINAL)/ $(Q)mkdir -p $(TARGET_OUT_FINAL)/
$(Q)cp $(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk
@echo "Generated out : $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk" @echo "Generated out : $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk"
$(Q)cp $(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk
@ -225,17 +234,13 @@ install:
@echo ------------------------------------------------------------------------ @echo ------------------------------------------------------------------------
@echo Install : $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk @echo Install : $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk
@echo ------------------------------------------------------------------------ @echo ------------------------------------------------------------------------
@# $(PROJECT_SDK)/platform-tools/adb kill-server
@# install application
$(Q)sudo $(PROJECT_SDK)/platform-tools/adb install -r $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk $(Q)sudo $(PROJECT_SDK)/platform-tools/adb install -r $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk
uninstall: uninstall:
@echo ------------------------------------------------------------------------ @echo ------------------------------------------------------------------------
@echo UnInstall : $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk @echo UnInstall : $(PROJECT_NAME2)
@echo ------------------------------------------------------------------------ @echo ------------------------------------------------------------------------
@echo ... TODO ... $(Q)sudo $(PROJECT_SDK)/platform-tools/adb uninstall $(PROJECT_NAME2)
log: log:
@echo ------------------------------------------------------------------------ @echo ------------------------------------------------------------------------
@ -243,3 +248,8 @@ log:
@echo ------------------------------------------------------------------------ @echo ------------------------------------------------------------------------
$(Q)sudo $(PROJECT_SDK)/platform-tools/adb shell logcat $(Q)sudo $(PROJECT_SDK)/platform-tools/adb shell logcat
shell:
@echo ------------------------------------------------------------------------
@echo Run android shell
@echo ------------------------------------------------------------------------
sudo $(PROJECT_SDK)/platform-tools/adb shell

3
core/setup-target.mk
View File

@ -95,7 +95,8 @@ endif
# define the target OS type for the compilation system ... # define the target OS type for the compilation system ...
TARGET_GLOBAL_CFLAGS += -D__TARGET_OS__$(TARGET_OS) TARGET_GLOBAL_CFLAGS += -D__TARGET_OS__$(TARGET_OS)
# basic define of the build time : # basic define of the build time :
TARGET_GLOBAL_CFLAGS += -DBUILD_TIME="\"$(shell date)\"" \ TARGET_GLOBAL_CFLAGS += -DBUILD_TIME="\"$(shell date +%Y-%m-%d_%T)\""
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
TARGET_GLOBAL_CFLAGS += -DDEBUG_LEVEL=3 TARGET_GLOBAL_CFLAGS += -DDEBUG_LEVEL=3