Commit c649ca60 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Renamed android Makefile targets to prevent conflicts

parent 9929ecc8
......@@ -193,14 +193,14 @@ class AndroidPreparator(prepare.Preparator):
arch_targets = ""
for arch in platforms:
arch_targets += """
{arch}: {arch}-build
android-{arch}: android-{arch}-build
{arch}-build:
android-{arch}-build:
\t{generator} android/android-{arch}/cmake
\t@echo "Done"
""".format(arch=arch, generator=generator)
makefile = """
archs={archs}
android-archs={archs}
TOPDIR=$(shell pwd)
.PHONY: all
......@@ -208,9 +208,9 @@ TOPDIR=$(shell pwd)
all: generate-android-sdk
build: $(addsuffix -build, $(archs))
android-build: $(addprefix android-, $(addsuffix -build, $(android-archs)))
copy-libs:
android-copy-libs:
\trm -rf Xamarin/Xamarin/Xamarin.Droid/Libs/armeabi-v7a
\tif test -d "android/liblinphone-sdk/android-armv7"; then \\
\t\tmkdir -p Xamarin/Xamarin/Xamarin.Droid/Libs/armeabi-v7a && \\
......@@ -240,7 +240,7 @@ create-jar:
\t./gradlew assembleRelease
\t./gradlew classJar
generate-android-sdk: build copy-libs create-jar
generate-android-sdk: android-build android-copy-libs create-jar
{arch_targets}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment