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

Side by Side Diff: native_client_sdk/src/tools/common.mk

Issue 19079002: Enable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: IOS flag name Created 7 years, 4 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # 5 #
6 # GNU Make based build file. For details on GNU Make see: 6 # GNU Make based build file. For details on GNU Make see:
7 # http://www.gnu.org/software/make/manual/make.html 7 # http://www.gnu.org/software/make/manual/make.html
8 # 8 #
9 9
10 # 10 #
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 # 424 #
425 RUN_PY := python $(NACL_SDK_ROOT)/tools/run.py 425 RUN_PY := python $(NACL_SDK_ROOT)/tools/run.py
426 426
427 # Add this to launch Chrome with additional environment variables defined. 427 # Add this to launch Chrome with additional environment variables defined.
428 # Each element should be specified as KEY=VALUE, with whitespace separating 428 # Each element should be specified as KEY=VALUE, with whitespace separating
429 # key-value pairs. e.g. 429 # key-value pairs. e.g.
430 # CHROME_ENV=FOO=1 BAR=2 BAZ=3 430 # CHROME_ENV=FOO=1 BAR=2 BAZ=3
431 CHROME_ENV ?= 431 CHROME_ENV ?=
432 432
433 # Additional arguments to pass to Chrome. 433 # Additional arguments to pass to Chrome.
434 CHROME_ARGS += --enable-nacl --enable-pnacl --no-first-run 434 CHROME_ARGS += --enable-nacl --no-first-run
435 CHROME_ARGS += --user-data-dir=$(CURDIR)/user-data-dir 435 CHROME_ARGS += --user-data-dir=$(CURDIR)/user-data-dir
436 436
437 437
438 # Paths to Debug and Release versions of the Host Pepper plugins 438 # Paths to Debug and Release versions of the Host Pepper plugins
439 PPAPI_DEBUG = $(abspath $(OSNAME)/Debug/$(TARGET)$(HOST_EXT));application/x-ppap i-debug 439 PPAPI_DEBUG = $(abspath $(OSNAME)/Debug/$(TARGET)$(HOST_EXT));application/x-ppap i-debug
440 PPAPI_RELEASE = $(abspath $(OSNAME)/Release/$(TARGET)$(HOST_EXT));application/x- ppapi-release 440 PPAPI_RELEASE = $(abspath $(OSNAME)/Release/$(TARGET)$(HOST_EXT));application/x- ppapi-release
441 441
442 442
443 SYSARCH := $(shell $(GETOS) --nacl-arch) 443 SYSARCH := $(shell $(GETOS) --nacl-arch)
444 SEL_LDR_PATH := python $(NACL_SDK_ROOT)/tools/sel_ldr.py 444 SEL_LDR_PATH := python $(NACL_SDK_ROOT)/tools/sel_ldr.py
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 # uppercase aliases (for backward compatibility) 486 # uppercase aliases (for backward compatibility)
487 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN 487 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN
488 CHECK_FOR_CHROME: check_for_chrome 488 CHECK_FOR_CHROME: check_for_chrome
489 DEBUG: debug 489 DEBUG: debug
490 LAUNCH: run 490 LAUNCH: run
491 RUN: run 491 RUN: run
492 492
493 endif # TOOLCHAIN is valid... 493 endif # TOOLCHAIN is valid...
494 494
495 endif # TOOLCHAIN=all 495 endif # TOOLCHAIN=all
OLDNEW
« no previous file with comments | « native_client_sdk/src/build_tools/test_projects.py ('k') | ppapi/native_client/chrome_main.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698