Fix build of allegro by ignoring failing allegro.aar target.
authorDaniel G <giri@nwrk.biz>
Tue, 5 Feb 2019 16:25:15 +0000 (17:25 +0100)
committerDaniel G <giri@nwrk.biz>
Tue, 5 Feb 2019 16:25:15 +0000 (17:25 +0100)
_template/packages/allegro5.2.4/Makefile

index 5ffd3af..ac7247c 100644 (file)
@@ -12,10 +12,10 @@ all: unpack android_arm
 .PHONY: unpack
 unpack:
        tar xvzf allegro-5.2.4.0.tar.gz
-       find $(WORKDIR)/allegro-5.2.4.0 -name build.gradle -exec sed -i -e '/compileSdkVersion.*/a buildToolsVersion "25.0.0"' {} \;
+       find $(WORKDIR)/allegro-5.2.4.0 -name build.gradle -exec sed -i -e '/compileSdkVersion.*/a buildToolsVersion "24.0.0"' {} \;
        find $(WORKDIR)/allegro-5.2.4.0 -name build.gradle -exec sed -i -e 's/compileSdkVersion.*/compileSdkVersion $(ANDROID_TARGET_VER)/g' {} \;
        find $(WORKDIR)/allegro-5.2.4.0 -name build.gradle -exec sed -i -e 's/targetSdkVersion.*/targetSdkVersion $(ANDROID_TARGET_VER)/g' {} \;
-       sed -i -e 's/classpath "com.android.tools.build:gradle:.*/classpath "com.android.tools.build:gradle:2.3.3"/g' $(WORKDIR)/allegro-5.2.4.0/android/gradle_project/build.gradle
+       sed -i -e 's/classpath "com.android.tools.build:gradle:.*/classpath "com.android.tools.build:gradle:debian"/g' $(WORKDIR)/allegro-5.2.4.0/android/gradle_project/build.gradle
        sed -i -e '/google()/a maven { url "file:\/\/\/usr\/share\/maven-repo" }' $(WORKDIR)/allegro-5.2.4.0/android/gradle_project/build.gradle
 
 .PHONY: android_arm
@@ -30,7 +30,7 @@ android_arm:
        -DWANT_TTF=ON -DFREETYPE_INCLUDE_DIRS=$(WORKDIR)/../../lib_include/android_arm -DFREETYPE_LIBRARY=$(WORKDIR)/../../lib/android_arm/libfreetype.a \
        -DCMAKE_BUILD_TYPE=Release -DANDROID_TARGET=android-$(ANDROID_TARGET_VER) -DARM_TARGETS=armeabi-v7a \
        -DSHARED=true -DWANT_MONOLITH=ON -DWANT_EXAMPLES=false -DWANT_DEMO=false  -DWANT_TESTS=false; \
-       make -j6
+       make -j6 -i
        mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
        cp -rf $(WORKDIR)/allegro-5.2.4.0/android/gradle_project/allegro/src/main/java/org/* $(WORKDIR)/../../lib/android_arm