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

Issue 299703016: Gate disabling nacl code on proper gyp flags, etc. (Closed)

Created:
6 years, 7 months ago by sehr
Modified:
6 years, 6 months ago
CC:
chromium-reviews, erikwright+watch_chromium.org
Visibility:
Public.

Description

Gate disabling nacl code on proper gyp flags, etc. Background: I am currently trying to test NaCl in clank by setting disable_nacl=0 and enable_plugins=1 in gyp. Some of the code required to get this to work is guarded under overly-specific OS==android and similar constructs. This first CL enables a coherent build with the flags set to gyp, but does not yet turn the functionality on completely. A sampling of issues fixed: 1) std:: prefix is more strictly observed on android 2) define NACL_LINUX, etc., is needed for nacl code 3) properly guard flag-setting code BUG= https://code.google.com/p/nativeclient/issues/detail?id=3032 R=bradnelson@google.com, darin@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=274839

Patch Set 1 #

Patch Set 2 : Enabled about://nacl UI under option #

Patch Set 3 : Use disable_nacl to gate definitions rather than OS #

Patch Set 4 : Remove speculative changes from review #

Total comments: 2

Patch Set 5 : Break overly-long line #

Patch Set 6 : Fix gyp variable scoping error in previous commit #

Patch Set 7 : Fix guard on flags code #

Unified diffs Side-by-side diffs Delta from patch set Stats (+58 lines, -36 lines) Patch
M base/base.gypi View 1 chunk +1 line, -1 line 0 comments Download
M build/build_config.h View 2 chunks +5 lines, -4 lines 0 comments Download
M build/common.gypi View 1 2 3 4 5 2 chunks +4 lines, -2 lines 0 comments Download
M build/filename_rules.gypi View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/about_flags.cc View 1 2 3 4 5 6 6 chunks +9 lines, -2 lines 0 comments Download
M components/nacl/loader/nacl_main.cc View 1 2 3 4 1 chunk +2 lines, -1 line 0 comments Download
M components/nacl/nacl_defines.gypi View 1 2 1 chunk +35 lines, -24 lines 0 comments Download
M components/nacl/renderer/json_manifest.cc View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 10 (0 generated)
sehr
Thanks in advance for comments. PTAL.
6 years, 6 months ago (2014-05-30 22:20:59 UTC) #1
darin (slow to review)
LGTM https://codereview.chromium.org/299703016/diff/60001/components/nacl/loader/nacl_main.cc File components/nacl/loader/nacl_main.cc (right): https://codereview.chromium.org/299703016/diff/60001/components/nacl/loader/nacl_main.cc#newcode30 components/nacl/loader/nacl_main.cc:30: #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_ANDROID) ...
6 years, 6 months ago (2014-05-30 22:41:28 UTC) #2
jam
i'm only owner in chrome, but darin is toplevel owner so removing myself
6 years, 6 months ago (2014-05-30 23:42:31 UTC) #3
bradn
lgtm (with the 80 col fix)
6 years, 6 months ago (2014-05-31 00:05:45 UTC) #4
sehr
Thanks for the reviews. Waiting for trybots. https://codereview.chromium.org/299703016/diff/60001/components/nacl/loader/nacl_main.cc File components/nacl/loader/nacl_main.cc (right): https://codereview.chromium.org/299703016/diff/60001/components/nacl/loader/nacl_main.cc#newcode30 components/nacl/loader/nacl_main.cc:30: #if defined(OS_WIN) ...
6 years, 6 months ago (2014-06-02 20:03:35 UTC) #5
sehr
Trybots turned up a couple of small issues. New version uploaded. PTAL. Sorry for the ...
6 years, 6 months ago (2014-06-02 23:27:26 UTC) #6
sehr
The CQ bit was checked by sehr@chromium.org
6 years, 6 months ago (2014-06-03 15:16:15 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/sehr@chromium.org/299703016/120001
6 years, 6 months ago (2014-06-03 15:16:39 UTC) #8
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: win_chromium_rel on tryserver.chromium ...
6 years, 6 months ago (2014-06-03 19:48:26 UTC) #9
sehr
6 years, 6 months ago (2014-06-04 15:40:04 UTC) #10
Message was sent while issue was closed.
Committed patchset #7 manually as r274839 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698