Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: source/libvpx/build/make/iosbuild.sh

Issue 394353005: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/build/make/configure.sh ('k') | source/libvpx/configure » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 ## 2 ##
3 ## Copyright (c) 2014 The WebM project authors. All Rights Reserved. 3 ## Copyright (c) 2014 The WebM project authors. All Rights Reserved.
4 ## 4 ##
5 ## Use of this source code is governed by a BSD-style license 5 ## Use of this source code is governed by a BSD-style license
6 ## that can be found in the LICENSE file in the root of the source 6 ## that can be found in the LICENSE file in the root of the source
7 ## tree. An additional intellectual property rights grant can be found 7 ## tree. An additional intellectual property rights grant can be found
8 ## in the file PATENTS. All contributing project authors may 8 ## in the file PATENTS. All contributing project authors may
9 ## be found in the AUTHORS file in the root of the source tree. 9 ## be found in the AUTHORS file in the root of the source tree.
10 ## 10 ##
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 #ifndef ${include_guard} 105 #ifndef ${include_guard}
106 #define ${include_guard} 106 #define ${include_guard}
107 107
108 #if defined" 108 #if defined"
109 109
110 printf "%s" "${file_header}" > "${config_file}" 110 printf "%s" "${file_header}" > "${config_file}"
111 for target in ${targets}; do 111 for target in ${targets}; do
112 preproc_symbol=$(target_to_preproc_symbol "${target}") 112 preproc_symbol=$(target_to_preproc_symbol "${target}")
113 printf " ${preproc_symbol}\n" >> "${config_file}" 113 printf " ${preproc_symbol}\n" >> "${config_file}"
114 printf "#define VPX_FRAMEWORK_TARGET \"${target}\"\n" >> "${config_file}"
114 printf "#include \"VPX/vpx/${target}/vpx_config.h\"\n" >> "${config_file}" 115 printf "#include \"VPX/vpx/${target}/vpx_config.h\"\n" >> "${config_file}"
115 printf "#elif defined" >> "${config_file}" 116 printf "#elif defined" >> "${config_file}"
116 mkdir "${HEADER_DIR}/${target}" 117 mkdir "${HEADER_DIR}/${target}"
117 cp -p "${BUILD_ROOT}/${target}/vpx_config.h" "${HEADER_DIR}/${target}" 118 cp -p "${BUILD_ROOT}/${target}/vpx_config.h" "${HEADER_DIR}/${target}"
118 done 119 done
119 120
120 # Consume the last line of output from the loop: We don't want it. 121 # Consume the last line of output from the loop: We don't want it.
121 sed -i '' -e '$d' "${config_file}" 122 sed -i '' -e '$d' "${config_file}"
122 123
123 printf "#endif\n\n" >> "${config_file}" 124 printf "#endif\n\n" >> "${config_file}"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 MAKE_JOBS=${MAKE_JOBS} 240 MAKE_JOBS=${MAKE_JOBS}
240 PRESERVE_BUILD_OUTPUT=${PRESERVE_BUILD_OUTPUT} 241 PRESERVE_BUILD_OUTPUT=${PRESERVE_BUILD_OUTPUT}
241 LIBVPX_SOURCE_DIR=${LIBVPX_SOURCE_DIR} 242 LIBVPX_SOURCE_DIR=${LIBVPX_SOURCE_DIR}
242 LIPO=${LIPO} 243 LIPO=${LIPO}
243 ORIG_PWD=${ORIG_PWD} 244 ORIG_PWD=${ORIG_PWD}
244 TARGETS="${TARGETS}" 245 TARGETS="${TARGETS}"
245 EOF 246 EOF
246 fi 247 fi
247 248
248 build_framework "${TARGETS}" 249 build_framework "${TARGETS}"
OLDNEW
« no previous file with comments | « source/libvpx/build/make/configure.sh ('k') | source/libvpx/configure » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698