Revert of NaCl: Update revision in DEPS, r13018 -> r13078. (https://codereview.chromium.org/249153003/)
Reason for revert:
Breaks official build on chromium.perf waterfall.
FAILED: cd ../../native_client/src/shared/gio; export BUILT_PRODUCTS_DIR=/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release; export CONFIGURATION=Release; export PRODUCT_NAME=gio_lib; export SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk; export SRCROOT=/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release/../../native_client/src/shared/gio; export SOURCE_ROOT="${SRCROOT}"; export TARGET_BUILD_DIR=/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release; export TEMP_DIR="${TMPDIR}";python ../../../../native_client/build/build_nexe.py -t ../../../../out/Release/gen/sdk/ --arch x86-32 --build glibc_nso --root ../../../.. --name ../../../../out/Release/gen/tc_glibc/lib32/libgio.so --objdir ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-32-so/gio_lib "--include-dirs=../../../../out/Release/gen/tc_glibc/include ../../../.. ../../../src/third_party ../../../.." "--compile_flags=-m32 -fPIC -fomit-frame-pointer -fasynchronous-unwind-tables -O2 -g -Wall -fdiagnostics-show-option -Werror " --gomadir "" "--defines=__linux__ \"__STDC_LIMIT_MACROS=1\" \"__STDC_FORMAT_MACROS=1\" \"_GNU_SOURCE=1\" \"_BSD_SOURCE=1\" \"_POSIX_C_SOURCE=199506\" \"_XOPEN_SOURCE=600\" \"DYNAMIC_ANNOTATIONS_ENABLED=1\" \"DYNAMIC_ANNOTATIONS_PREFIX=NACL_\" \"NACL_BUILD_ARCH=x86\" V8_DEPRECATION_WARNINGS BLINK_SCALE_FILTERS_AT_RECORD_TIME \"NACL_LINUX=0\" \"NACL_ANDROID=0\" \"NACL_OSX=1\" \"NACL_WINDOWS=0\" GOOGLE_CHROME_BUILD ENABLE_RLZ \"USE_LIBJPEG_TURBO=1\" ENABLE_ONE_CLICK_SIGNIN \"ENABLE_REMOTING=1\" \"ENABLE_WEBRTC=1\" USE_PROPRIETARY_CODECS ENABLE_PEPPER_CDMS ENABLE_CONFIGURATION_POLICY ENABLE_INPUT_SPEECH ENABLE_NOTIFICATIONS \"ENABLE_HIDPI=1\" DISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY SYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE \"ENABLE_EGLIMAGE=1\" \"ENABLE_TASK_MANAGER=1\" \"ENABLE_EXTENSIONS=1\" \"ENABLE_PLUGIN_INSTALLATION=1\" \"ENABLE_PLUGINS=1\" \"ENABLE_SESSION_SERVICE=1\" \"ENABLE_THEMES=1\" \"ENABLE_AUTOFILL_DIALOG=1\" \"ENABLE_BACKGROUND=1\" \"ENABLE_GOOGLE_NOW=1\" \"CLD_VERSION=2\" \"ENABLE_FULL_PRINTING=1\" \"ENABLE_PRINTING=1\" \"ENABLE_SPELLCHECK=1\" \"ENABLE_CAPTIVE_PORTAL_DETECTION=1\" \"ENABLE_APP_LIST=1\" \"ENABLE_SETTINGS_APP=1\" \"ENABLE_MANAGED_USERS=1\" \"ENABLE_SERVICE_DISCOVERY=1\" \"NACL_TARGET_SUBARCH=32\" \"NACL_TARGET_ARCH=x86\" \"NACL_BUILD_SUBARCH=32\" \"NACL_BUILD_ARCH=x86\"" "--link_flags=-m32 -B../../../../out/Release/gen/tc_glibc/lib32 " "--source-list=../../../../out/gypfiles/native_client/src/shared/gio/glibc-x86-32-so.gio_lib.source_list.gypcmd"
/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release/gen/sdk/mac_x86/nacl_x86_glibc/bin/../lib/gcc/x86_64-nacl/4.4.3/../../../../x86_64-nacl/bin/ld: cannot find crti.o: No such file or directory
/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release/gen/sdk/mac_x86/nacl_x86_glibc/bin/../lib/gcc/x86_64-nacl/4.4.3/../../../../x86_64-nacl/bin/ld: cannot find crtbeginS.o: No such file or directory
collect2: ld returned 1 exit status
../../../../out/Release/gen/sdk/mac_x86/nacl_x86_glibc/bin/x86_64-nacl-g++ -o ../../../../out/Release/gen/tc_glibc/lib32/libgio.so -Wl,--as-needed ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-32-so/gio_lib/gio_mem.o ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-32-so/gio_lib/gio.o ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-32-so/gio_lib/gprintf.o ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-32-so/gio_lib/gio_mem_snapshot.o -m32 -B../../../../out/Release/gen/tc_glibc/lib32 -shared -Wl,-soname,libgio.so
FAILED: Command '['../../../../out/Release/gen/sdk/mac_x86/nacl_x86_glibc/bin/x86_64-nacl-g++', '-o', '../../../../out/Release/gen/tc_glibc/lib32/libgio.so', '-Wl,--as-needed', '../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-32-so/gio_lib/gio_mem.o', '../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-32-so/gio_lib/gio.o', '../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-32-so/gio_lib/gprintf.o', '../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-32-so/gio_lib/gio_mem_snapshot.o', '-m32', '-B../../../../out/Release/gen/tc_glibc/lib32', '-shared', '-Wl,-soname,libgio.so']' returned non-zero exit status 1
FAILED: cd ../../native_client/src/shared/gio; export BUILT_PRODUCTS_DIR=/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release; export CONFIGURATION=Release; export PRODUCT_NAME=gio_lib; export SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk; export SRCROOT=/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release/../../native_client/src/shared/gio; export SOURCE_ROOT="${SRCROOT}"; export TARGET_BUILD_DIR=/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release; export TEMP_DIR="${TMPDIR}";python ../../../../native_client/build/build_nexe.py -t ../../../../out/Release/gen/sdk/ --arch x86-64 --build glibc_nso --root ../../../.. --name ../../../../out/Release/gen/tc_glibc/lib64/libgio.so --objdir ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-64-so/gio_lib "--include-dirs=../../../../out/Release/gen/tc_glibc/include ../../../.. ../../../src/third_party ../../../.." "--compile_flags=-m64 -fPIC -fomit-frame-pointer -fasynchronous-unwind-tables -O2 -g -Wall -fdiagnostics-show-option -Werror " --gomadir "" "--defines=__linux__ \"__STDC_LIMIT_MACROS=1\" \"__STDC_FORMAT_MACROS=1\" \"_GNU_SOURCE=1\" \"_BSD_SOURCE=1\" \"_POSIX_C_SOURCE=199506\" \"_XOPEN_SOURCE=600\" \"DYNAMIC_ANNOTATIONS_ENABLED=1\" \"DYNAMIC_ANNOTATIONS_PREFIX=NACL_\" \"NACL_BUILD_ARCH=x86\" V8_DEPRECATION_WARNINGS BLINK_SCALE_FILTERS_AT_RECORD_TIME \"NACL_LINUX=0\" \"NACL_ANDROID=0\" \"NACL_OSX=1\" \"NACL_WINDOWS=0\" GOOGLE_CHROME_BUILD ENABLE_RLZ \"USE_LIBJPEG_TURBO=1\" ENABLE_ONE_CLICK_SIGNIN \"ENABLE_REMOTING=1\" \"ENABLE_WEBRTC=1\" USE_PROPRIETARY_CODECS ENABLE_PEPPER_CDMS ENABLE_CONFIGURATION_POLICY ENABLE_INPUT_SPEECH ENABLE_NOTIFICATIONS \"ENABLE_HIDPI=1\" DISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY SYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE \"ENABLE_EGLIMAGE=1\" \"ENABLE_TASK_MANAGER=1\" \"ENABLE_EXTENSIONS=1\" \"ENABLE_PLUGIN_INSTALLATION=1\" \"ENABLE_PLUGINS=1\" \"ENABLE_SESSION_SERVICE=1\" \"ENABLE_THEMES=1\" \"ENABLE_AUTOFILL_DIALOG=1\" \"ENABLE_BACKGROUND=1\" \"ENABLE_GOOGLE_NOW=1\" \"CLD_VERSION=2\" \"ENABLE_FULL_PRINTING=1\" \"ENABLE_PRINTING=1\" \"ENABLE_SPELLCHECK=1\" \"ENABLE_CAPTIVE_PORTAL_DETECTION=1\" \"ENABLE_APP_LIST=1\" \"ENABLE_SETTINGS_APP=1\" \"ENABLE_MANAGED_USERS=1\" \"ENABLE_SERVICE_DISCOVERY=1\" \"NACL_TARGET_SUBARCH=32\" \"NACL_TARGET_ARCH=x86\" \"NACL_BUILD_SUBARCH=32\" \"NACL_BUILD_ARCH=x86\"" "--link_flags=-B../../../../out/Release/gen/tc_glibc/lib64 " "--source-list=../../../../out/gypfiles/native_client/src/shared/gio/glibc-x86-64-so.gio_lib.source_list.gypcmd"
/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release/gen/sdk/mac_x86/nacl_x86_glibc/bin/../lib/gcc/x86_64-nacl/4.4.3/../../../../x86_64-nacl/bin/ld: cannot find crti.o: No such file or directory
/Volumes/data/b/build/slave/chromium-rel-mac-builder/build/src/out/Release/gen/sdk/mac_x86/nacl_x86_glibc/bin/../lib/gcc/x86_64-nacl/4.4.3/../../../../x86_64-nacl/bin/ld: cannot find crtbeginS.o: No such file or directory
collect2: ld returned 1 exit status
../../../../out/Release/gen/sdk/mac_x86/nacl_x86_glibc/bin/x86_64-nacl-g++ -o ../../../../out/Release/gen/tc_glibc/lib64/libgio.so -Wl,--as-needed ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-64-so/gio_lib/gio_mem.o ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-64-so/gio_lib/gio.o ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-64-so/gio_lib/gprintf.o ../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-64-so/gio_lib/gio_mem_snapshot.o -B../../../../out/Release/gen/tc_glibc/lib64 -shared -Wl,-soname,libgio.so
FAILED: Command '['../../../../out/Release/gen/sdk/mac_x86/nacl_x86_glibc/bin/x86_64-nacl-g++', '-o', '../../../../out/Release/gen/tc_glibc/lib64/libgio.so', '-Wl,--as-needed', '../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-64-so/gio_lib/gio_mem.o', '../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-64-so/gio_lib/gio.o', '../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-64-so/gio_lib/gprintf.o', '../../../../out/Release/obj/native_client/src/shared/gio/gio_lib.gen/glibc-x86-64-so/gio_lib/gio_mem_snapshot.o', '-B../../../../out/Release/gen/tc_glibc/lib64', '-shared', '-Wl,-soname,libgio.so']' returned non-zero exit status 1
ninja: build stopped: subcommand failed.
http://build.chromium.org/p/chromium.perf/builders/Mac%20Builder/builds/60425/steps/compile/logs/stdio
Original issue's description:
> NaCl: Update revision in DEPS, r13018 -> r13078.
>
> Chromium NaCl scripts now uses package_version to extract.
>
> Now that we have split up the toolchain into multiple tars, we should
> use the package versioning script to manage which tars to extract.
> Unfortunately, currently the SDK uses different directory names compared
> to what the NaCl toolchain directories normally use, so we also must map
> and move the toolchain directories to the SDK ones.
>
> BUG=365817
> TEST= trybots
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266284
[email protected],[email protected],[email protected],[email protected],[email protected]
NOTREECHECKS=true
NOTRY=true
BUG=365817
Review URL: https://codereview.chromium.org/250933006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266326 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py
index 4895c1a3..3a4cb1b 100755
--- a/build/download_nacl_toolchains.py
+++ b/build/download_nacl_toolchains.py
@@ -17,16 +17,16 @@
src_dir = os.path.dirname(script_dir)
nacl_dir = os.path.join(src_dir, 'native_client')
nacl_build_dir = os.path.join(nacl_dir, 'build')
- package_version_dir = os.path.join(nacl_build_dir, 'package_version')
- package_version = os.path.join(package_version_dir, 'package_version.py')
- if not os.path.exists(package_version):
- print "Can't find '%s'" % package_version
+ download_script = os.path.join(nacl_build_dir, 'download_toolchains.py')
+ if not os.path.exists(download_script):
+ print "Can't find '%s'" % download_script
print 'Presumably you are intentionally building without NativeClient.'
print 'Skipping NativeClient toolchain download.'
sys.exit(0)
- sys.path.insert(0, package_version_dir)
- import package_version
+ sys.path.insert(0, nacl_build_dir)
+ import download_toolchains
+ # TODO (robertm): Finish getting PNaCl ready for prime time.
# BUG:
# We remove this --optional-pnacl argument, and instead replace it with
# --no-pnacl for most cases. However, if the bot name is an sdk
@@ -41,17 +41,21 @@
if use_pnacl:
print '\n*** DOWNLOADING PNACL TOOLCHAIN ***\n'
else:
- args.extend(['--exclude', 'pnacl_newlib'])
+ args.append('--no-pnacl')
# Only download the ARM gcc toolchain if we are building for ARM
# TODO(olonho): we need to invent more reliable way to get build
# configuration info, to know if we're building for ARM.
- if 'target_arch=arm' not in os.environ.get('GYP_DEFINES', ''):
- args.extend(['--exclude', 'nacl_arm_newlib'])
+ if 'target_arch=arm' in os.environ.get('GYP_DEFINES', ''):
+ args.append('--arm-untrusted')
- args.append('sync')
- args.append('--extract')
- package_version.main(args)
+ # Append the name of the file to use as a version and hash source.
+ # NOTE: While not recommended, it is possible to redirect this file to
+ # a chrome location to avoid branching NaCl if just a toolchain needs
+ # to be bumped.
+ args.append(os.path.join(nacl_dir, 'TOOL_REVISIONS'))
+
+ download_toolchains.main(args)
return 0
