From 277f2116b6660e9bbe7f5d67524be57eceb49b8b Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 7 Apr 2020 23:30:51 -0400 Subject: Move aom source to a sub-directory under media/libaom There is no damned reason to treat this differently than any other media lib given its license and there never was. --- .../aom/build/cmake/toolchains/armv7-ios.cmake | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 third_party/aom/build/cmake/toolchains/armv7-ios.cmake (limited to 'third_party/aom/build/cmake/toolchains/armv7-ios.cmake') diff --git a/third_party/aom/build/cmake/toolchains/armv7-ios.cmake b/third_party/aom/build/cmake/toolchains/armv7-ios.cmake deleted file mode 100644 index 32a1b534a..000000000 --- a/third_party/aom/build/cmake/toolchains/armv7-ios.cmake +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (c) 2017, Alliance for Open Media. All rights reserved -# -# This source code is subject to the terms of the BSD 2 Clause License and the -# Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License was -# not distributed with this source code in the LICENSE file, you can obtain it -# at www.aomedia.org/license/software. If the Alliance for Open Media Patent -# License 1.0 was not distributed with this source code in the PATENTS file, you -# can obtain it at www.aomedia.org/license/patent. -# -if(AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_) - return() -endif() # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_ -set(AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_ 1) - -if(XCODE) - - # TODO(tomfinegan): Handle arm builds in Xcode. - message(FATAL_ERROR "This toolchain does not support Xcode.") -endif() - -set(CMAKE_SYSTEM_PROCESSOR "armv7") -set(CMAKE_OSX_ARCHITECTURES "armv7") - -include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake") - -# No intrinsics flag required for armv7s-ios. -set(AOM_NEON_INTRIN_FLAG "") - -# No runtime cpu detect for armv7s-ios. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") -- cgit v1.2.3