git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix epub compatibility + cover image ext
[fanfix.git]
/
Makefile.base
diff --git
a/Makefile.base
b/Makefile.base
index acc36d3aa9ed8a229426aadb357082d4fcfe7a03..651b10c1fbfaea632874bb80fb1801465857e734 100644
(file)
--- a/
Makefile.base
+++ b/
Makefile.base
@@
-201,14
+201,7
@@
android/app/src:
ln -s ../../../../res .; \
ln -s ../../../../src ./java; \
)
ln -s ../../../../res .; \
ln -s ../../../../src ./java; \
)
-
-apk: libs ${NAME}.apk
- @echo Building APK files...
-
-${NAME}.apk: ${NAME}-debug.apk
-
-${NAME}-debug.apk: android
- @echo Starting gradlew assemble...
+ @echo Fixing configuration...
@( \
cd android/app/src/main/java; \
excl="\\n";\
@( \
cd android/app/src/main/java; \
excl="\\n";\
@@
-223,7
+216,17
@@
${NAME}-debug.apk: android
| sed 's:\(applicationId "\)":\1${ID_FOR_ANDROID}":' \
| sed "s:\s*exclude '':$$excl:g" \
> build.gradle; \
| sed 's:\(applicationId "\)":\1${ID_FOR_ANDROID}":' \
| sed "s:\s*exclude '':$$excl:g" \
> build.gradle; \
- cd ../ ; \
+ )
+
+apk: libs ${NAME}.apk
+ @echo Building APK files...
+
+${NAME}.apk: ${NAME}-debug.apk
+
+${NAME}-debug.apk: android
+ @echo Starting gradlew assemble...
+ @( \
+ cd android/; \
bash gradlew assemble && ( \
cd ..; \
cp android/app/build/outputs/apk/release/app-release-unsigned.apk ${NAME}.apk; \
bash gradlew assemble && ( \
cd ..; \
cp android/app/build/outputs/apk/release/app-release-unsigned.apk ${NAME}.apk; \