From 82e7dbe57ae4863ccadb8e96746b0f9da0a85c12 Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Mon, 25 Jul 2016 06:51:09 +0000 Subject: [PATCH] [android]: separate different arch script to different directory git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1093 6e48237b-75ef-9749-8fc9-41990f28c85a --- .../{make-Android-64bit.bash => aarch64/make-Android.bash} | 4 ++-- .../{make-Android-32bit.bash => arm/make-Android.bash} | 4 ++-- .../{make-Android-x86.bash => x86/make-Android.bash} | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename build/android/{make-Android-64bit.bash => aarch64/make-Android.bash} (96%) rename build/android/{make-Android-32bit.bash => arm/make-Android.bash} (96%) rename build/android/{make-Android-x86.bash => x86/make-Android.bash} (95%) diff --git a/build/android/make-Android-64bit.bash b/build/android/aarch64/make-Android.bash similarity index 96% rename from build/android/make-Android-64bit.bash rename to build/android/aarch64/make-Android.bash index 30bde9ee..31eb7c33 100755 --- a/build/android/make-Android-64bit.bash +++ b/build/android/aarch64/make-Android.bash @@ -9,7 +9,7 @@ fi PLATFORM=$ANDROID_NDK/platforms/android-21/arch-arm64 -cmake -DCMAKE_TOOLCHAIN_FILE=./android.toolchain.cmake \ +cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake \ -DCMAKE_BUILD_TYPE=Release \ -DANDROID_FORCE_ARM_BUILD=ON \ -DANDROID_NDK=${ANDROID_NDK} \ @@ -19,7 +19,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=./android.toolchain.cmake \ -DANDROID_NATIVE_API_LEVEL=android-21 \ -DANDROID_STL=system \ -DCMAKE_RKPLATFORM_ENABLE=ON \ - ../../ + ../../../ # ---------------------------------------------------------------------------- # usefull cmake debug flag diff --git a/build/android/make-Android-32bit.bash b/build/android/arm/make-Android.bash similarity index 96% rename from build/android/make-Android-32bit.bash rename to build/android/arm/make-Android.bash index cc3dc6d9..5de5c8e5 100755 --- a/build/android/make-Android-32bit.bash +++ b/build/android/arm/make-Android.bash @@ -9,7 +9,7 @@ fi PLATFORM=$ANDROID_NDK/platforms/android-21/arch-arm -cmake -DCMAKE_TOOLCHAIN_FILE=./android.toolchain.cmake \ +cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake \ -DCMAKE_BUILD_TYPE=Release \ -DANDROID_FORCE_ARM_BUILD=ON \ -DANDROID_NDK=${ANDROID_NDK} \ @@ -19,7 +19,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=./android.toolchain.cmake \ -DANDROID_NATIVE_API_LEVEL=android-21 \ -DANDROID_STL=system \ -DCMAKE_RKPLATFORM_ENABLE=ON \ - ../../ + ../../../ # ---------------------------------------------------------------------------- # usefull cmake debug flag diff --git a/build/android/make-Android-x86.bash b/build/android/x86/make-Android.bash similarity index 95% rename from build/android/make-Android-x86.bash rename to build/android/x86/make-Android.bash index 7c4e231b..411fe759 100755 --- a/build/android/make-Android-x86.bash +++ b/build/android/x86/make-Android.bash @@ -9,17 +9,17 @@ fi PLATFORM=$ANDROID_NDK/platforms/android-21/arch-x86 -cmake -DCMAKE_TOOLCHAIN_FILE=./android.toolchain.cmake \ +cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake \ -DCMAKE_BUILD_TYPE=Release \ -DANDROID_FORCE_ARM_BUILD=ON \ -DANDROID_NDK=${ANDROID_NDK} \ -DANDROID_SYSROOT=${PLATFORM} \ -DANDROID_ABI="x86" \ - -DANDROID_TOOLCHAIN_NAME="x86-4.8" \ + -DANDROID_TOOLCHAIN_NAME="x86-4.8" \ -DANDROID_NATIVE_API_LEVEL=android-21 \ -DANDROID_STL=system \ -DCMAKE_RKPLATFORM_ENABLE=ON \ - ../../ + ../../../ # ---------------------------------------------------------------------------- # usefull cmake debug flag