From 6786a9b0aaad60ba08d61c20166500e2b07c84c5 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Tue, 12 Nov 2019 20:19:58 +0100 Subject: [PATCH] JNI-81: Add missing libetpan clean --- android/external/arm64-v8a/Makefile | 8 ++++---- android/external/armeabi-v7a/Makefile | 8 ++++---- android/external/downloads/Makefile | 2 ++ android/external/x86/Makefile | 8 ++++---- android/external/x86_64/Makefile | 8 ++++---- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/android/external/arm64-v8a/Makefile b/android/external/arm64-v8a/Makefile index 87162ec..f52473c 100644 --- a/android/external/arm64-v8a/Makefile +++ b/android/external/arm64-v8a/Makefile @@ -138,8 +138,8 @@ libetpan/Makefile: libetpan.src.stamp | libiconv-install libetpan-build: libetpan/Makefile -libetpan-cleanzip: - rm -f libetpan/build-android/libetpan-android-1.zip +libetpan-clean: + rm -rf libetpan #------------------------------------------------------------------------------# # uuid @@ -374,14 +374,14 @@ clean-assets: clean-install: rm -rf $(LOCAL) -clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip +clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-clean clean-all: clean rm -rf *.git rm -rf *.stamp #------------------------------------------------------------------------------# -.PHONY = clean clean-install clean-assets libetpan-cleanzip\ +.PHONY = clean clean-install clean-assets libetpan-clean\ libiconv-build libiconv-install \ libetpan-build \ uuid-build uuid-prebuild uuid-install \ diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile index 478e693..f87d5d5 100644 --- a/android/external/armeabi-v7a/Makefile +++ b/android/external/armeabi-v7a/Makefile @@ -138,8 +138,8 @@ libetpan/Makefile: libetpan.src.stamp | libiconv-install libetpan-build: libetpan/Makefile -libetpan-cleanzip: - rm -f libetpan/build-android/libetpan-android-1.zip +libetpan-clean: + rm -rf libetpan #------------------------------------------------------------------------------# # uuid @@ -381,14 +381,14 @@ clean-assets: clean-install: rm -rf $(LOCAL) -clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip +clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-clean clean-all: clean rm -rf *.git rm -rf *.stamp #------------------------------------------------------------------------------# -.PHONY = clean clean-install clean-assets libetpan-cleanzip\ +.PHONY = clean clean-install clean-assets libetpan-clean \ libiconv-build libiconv-install \ libetpan-build \ uuid-build uuid-prebuild uuid-install \ diff --git a/android/external/downloads/Makefile b/android/external/downloads/Makefile index 957f01f..38218b0 100644 --- a/android/external/downloads/Makefile +++ b/android/external/downloads/Makefile @@ -113,6 +113,8 @@ clean: rm -rf *.tar.bz2 rm -rf ../arm64-v8a/ndk-standalone-toolchain rm -rf ../armeabi-v7a/ndk-standalone-toolchain + rm -rf ../x86/ndk-standalone-toolchain + rm -rf ../x86_64/ndk-standalone-toolchain .PHONY: all clean download-iconv \ download-uuid download-etpan \ diff --git a/android/external/x86/Makefile b/android/external/x86/Makefile index e412535..44fbcc8 100644 --- a/android/external/x86/Makefile +++ b/android/external/x86/Makefile @@ -138,8 +138,8 @@ libetpan/Makefile: libetpan.src.stamp | libiconv-install libetpan-build: libetpan/Makefile -libetpan-cleanzip: - rm -f libetpan/build-android/libetpan-android-1.zip +libetpan-clean: + rm -rf libetpan #------------------------------------------------------------------------------# # uuid @@ -373,14 +373,14 @@ clean-assets: clean-install: rm -rf $(LOCAL) -clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip +clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-clean clean-all: clean rm -rf *.git rm -rf *.stamp #------------------------------------------------------------------------------# -.PHONY = clean clean-install clean-assets libetpan-cleanzip\ +.PHONY = clean clean-install clean-assets libetpan-clean \ libiconv-build libiconv-install \ libetpan-build \ uuid-build uuid-prebuild uuid-install \ diff --git a/android/external/x86_64/Makefile b/android/external/x86_64/Makefile index dc512e5..0118575 100644 --- a/android/external/x86_64/Makefile +++ b/android/external/x86_64/Makefile @@ -138,8 +138,8 @@ libetpan/Makefile: libetpan.src.stamp | libiconv-install libetpan-build: libetpan/Makefile -libetpan-cleanzip: - rm -f libetpan/build-android/libetpan-android-1.zip +libetpan-clean: + rm -rf libetpan #------------------------------------------------------------------------------# # uuid @@ -373,14 +373,14 @@ clean-assets: clean-install: rm -rf $(LOCAL) -clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip +clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-clean clean-all: clean rm -rf *.git rm -rf *.stamp #------------------------------------------------------------------------------# -.PHONY = clean clean-install clean-assets libetpan-cleanzip\ +.PHONY = clean clean-install clean-assets libetpan-clean \ libiconv-build libiconv-install \ libetpan-build \ uuid-build uuid-prebuild uuid-install \