summaryrefslogtreecommitdiff
path: root/build/make/Android.mk
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2016-07-29 12:31:40 -0700
committerJohann <johannkoenig@google.com>2016-08-04 12:55:06 -0700
commitd55724fae9cb27e070add7952394fc0427ef2061 (patch)
tree9adfc4144df76b6192e7b2ad9c59d58d58dd0804 /build/make/Android.mk
parent476e8fc8558592f5535ec2bcdfc6798d35f65f12 (diff)
downloadlibvpx-d55724fae9cb27e070add7952394fc0427ef2061.tar
libvpx-d55724fae9cb27e070add7952394fc0427ef2061.tar.gz
libvpx-d55724fae9cb27e070add7952394fc0427ef2061.tar.bz2
libvpx-d55724fae9cb27e070add7952394fc0427ef2061.zip
Remove armv6 target
Change-Id: I1fa81cc9cabf362a185fc3a53f1e58de533a41e5
Diffstat (limited to 'build/make/Android.mk')
-rw-r--r--build/make/Android.mk11
1 files changed, 0 insertions, 11 deletions
diff --git a/build/make/Android.mk b/build/make/Android.mk
index 9eb6dd280..9ccb5da26 100644
--- a/build/make/Android.mk
+++ b/build/make/Android.mk
@@ -29,11 +29,6 @@
# include $(CLEAR_VARS)
# include jni/libvpx/build/make/Android.mk
#
-# There are currently two TARGET_ARCH_ABI targets for ARM.
-# armeabi and armeabi-v7a. armeabi-v7a is selected by creating an
-# Application.mk in the jni directory that contains:
-# APP_ABI := armeabi-v7a
-#
# By default libvpx will detect at runtime the existance of NEON extension.
# For this we import the 'cpufeatures' module from the NDK sources.
# libvpx can also be configured without this runtime detection method.
@@ -42,9 +37,6 @@
# --disable-neon-asm
# will remove any NEON dependency.
-# To change to building armeabi, run ./libvpx/configure again, but with
-# --target=armv6-android-gcc and modify the Application.mk file to
-# set APP_ABI := armeabi
#
# Running ndk-build will build libvpx and include it in your project.
#
@@ -59,9 +51,6 @@ ASM_CNV_PATH := $(LOCAL_PATH)/$(ASM_CNV_PATH_LOCAL)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
include $(CONFIG_DIR)libs-armv7-android-gcc.mk
LOCAL_ARM_MODE := arm
-else ifeq ($(TARGET_ARCH_ABI),armeabi)
- include $(CONFIG_DIR)libs-armv6-android-gcc.mk
- LOCAL_ARM_MODE := arm
else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
include $(CONFIG_DIR)libs-armv8-android-gcc.mk
LOCAL_ARM_MODE := arm