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

Side by Side Diff: import_from_android.sh

Issue 35493002: Update Channel ID API to use a callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Fix key ownsership Created 7 years, 1 month 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
« no previous file with comments | « no previous file | openssl/include/openssl/ssl.h » ('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) 2013 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Sanitize environment. 7 # Sanitize environment.
8 set -e 8 set -e
9 export LANG=C 9 export LANG=C
10 export LC_ALL=C 10 export LC_ALL=C
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 # directory and replace it with something completely new. This is a problem 332 # directory and replace it with something completely new. This is a problem
333 # when using subversion because this also gets rid of all .svn 333 # when using subversion because this also gets rid of all .svn
334 # subdirectories. This makes it impossible to commit the right set of 334 # subdirectories. This makes it impossible to commit the right set of
335 # changes with "gcl commit". 335 # changes with "gcl commit".
336 # 336 #
337 # To work-around this, copy all the .svn subdirectories into a temporary 337 # To work-around this, copy all the .svn subdirectories into a temporary
338 # tarball, which will be extracted after the import process. 338 # tarball, which will be extracted after the import process.
339 # 339 #
340 dump "Saving .svn subdirectories" 340 dump "Saving .svn subdirectories"
341 SAVED_SVN_TARBALL=$BUILD_DIR/saved-svn-subdirs.tar.gz 341 SAVED_SVN_TARBALL=$BUILD_DIR/saved-svn-subdirs.tar.gz
342 #run tar czf $SAVED_SVN_TARBALL $(find . -type d -name ".svn") 342 run tar czf $SAVED_SVN_TARBALL $(find . -type d -name ".svn")
343 343
344 # Re-run the import_openssl.sh script. 344 # Re-run the import_openssl.sh script.
345 dump "Re-running the 'import_openssl.sh' script to reconfigure all sources." 345 dump "Re-running the 'import_openssl.sh' script to reconfigure all sources."
346 ( 346 (
347 cd $ANDROID_SRC_DIR 347 cd $ANDROID_SRC_DIR
348 run ./import_openssl.sh import $DOWNLOAD_DIR/$OPENSSL_PACKAGE 348 run ./import_openssl.sh import $DOWNLOAD_DIR/$OPENSSL_PACKAGE
349 ) 349 )
350 350
351 dump "Copying new Android sources to final location." 351 dump "Copying new Android sources to final location."
352 clean_openssl_new () { 352 clean_openssl_new () {
353 rm -rf "$PROGDIR/openssl.new" 353 rm -rf "$PROGDIR/openssl.new"
354 } 354 }
355 atexit clean_openssl_new 355 atexit clean_openssl_new
356 356
357 run cp -rp "$ANDROID_SRC_DIR" "$PROGDIR/openssl.new" 357 run cp -rp "$ANDROID_SRC_DIR" "$PROGDIR/openssl.new"
358 run mv "$PROGDIR/openssl" "$PROGDIR/openssl.old" 358 run mv "$PROGDIR/openssl" "$PROGDIR/openssl.old"
359 run mv "$PROGDIR/openssl.new" "$PROGDIR/openssl" 359 run mv "$PROGDIR/openssl.new" "$PROGDIR/openssl"
360 run rm -rf "$PROGDIR/openssl.old" 360 run rm -rf "$PROGDIR/openssl.old"
361 361
362 dump "Restoring .svn subdirectores" 362 dump "Restoring .svn subdirectores"
363 # run tar xzf $SAVED_SVN_TARBALL 363 run tar xzf $SAVED_SVN_TARBALL
364 364
365 # Extract list of source files or compiler defines from openssl.config 365 # Extract list of source files or compiler defines from openssl.config
366 # variable definition. This assumes that the lists are in variables that 366 # variable definition. This assumes that the lists are in variables that
367 # are named as <prefix><suffix> or <prefix><suffix><arch>. 367 # are named as <prefix><suffix> or <prefix><suffix><arch>.
368 # 368 #
369 # A few examples: 369 # A few examples:
370 # get_gyp_list "FOO BAR" _SOURCES 370 # get_gyp_list "FOO BAR" _SOURCES
371 # -> returns '$FOO_SOURCES $BAR_SOURCES' 371 # -> returns '$FOO_SOURCES $BAR_SOURCES'
372 # 372 #
373 # get_gyp_list FOO _SOURCES_ "arm x86" 373 # get_gyp_list FOO _SOURCES_ "arm x86"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 > $PROGDIR/config/x64/openssl/opensslconf.h 461 > $PROGDIR/config/x64/openssl/opensslconf.h
462 462
463 dump "Generating .gypi file." 463 dump "Generating .gypi file."
464 . $ANDROID_SRC_DIR/openssl.config 464 . $ANDROID_SRC_DIR/openssl.config
465 generate_gyp_file > $PROGDIR/openssl.gypi.new 465 generate_gyp_file > $PROGDIR/openssl.gypi.new
466 run mv $PROGDIR/openssl.gypi $PROGDIR/openssl.gypi.old 466 run mv $PROGDIR/openssl.gypi $PROGDIR/openssl.gypi.old
467 run mv $PROGDIR/openssl.gypi.new $PROGDIR/openssl.gypi 467 run mv $PROGDIR/openssl.gypi.new $PROGDIR/openssl.gypi
468 run rm $PROGDIR/openssl.gypi.old 468 run rm $PROGDIR/openssl.gypi.old
469 469
470 dump "Done." 470 dump "Done."
OLDNEW
« no previous file with comments | « no previous file | openssl/include/openssl/ssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698