diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 20:44:06 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 20:44:06 +0000 |
| commit | d16f43f635827c9af0b112892c2308b6c4088607 (patch) | |
| tree | 3553f54de10f45f90bb4aad69f3edb5dea64eb8b | |
| parent | 52a1df86db0223b105bfbf415b0b04cc0a823ffe (diff) | |
| download | chromium_src-d16f43f635827c9af0b112892c2308b6c4088607.zip chromium_src-d16f43f635827c9af0b112892c2308b6c4088607.tar.gz chromium_src-d16f43f635827c9af0b112892c2308b6c4088607.tar.bz2 | |
Merge 174648
> Fix hello world
>
> Typo JavsScript->JavaScript
> Missing example.js file
> Can not build and run as HOST due to overriden PPAPI_DEBUG var
> in the Makefile.
>
> This CL only affects files in the SDK, it is not used to build chrome.
>
> NOTRY=true
> TBR=binji@chromium.org
> BUG=167615
>
>
> Review URL: https://chromiumcodereview.appspot.com/11677003
TBR=noelallen@chromium.org
Review URL: https://codereview.chromium.org/11828003
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@175579 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | native_client_sdk/src/build_tools/generate_make.py | 2 | ||||
| -rw-r--r-- | native_client_sdk/src/examples/hello_world/example.dsc | 1 | ||||
| -rw-r--r-- | native_client_sdk/src/examples/hello_world/hello_world.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/native_client_sdk/src/build_tools/generate_make.py b/native_client_sdk/src/build_tools/generate_make.py index af3f839..5b6fd37 100755 --- a/native_client_sdk/src/build_tools/generate_make.py +++ b/native_client_sdk/src/build_tools/generate_make.py @@ -159,7 +159,7 @@ def GenerateRules(desc, tools): incs = target.get('INCLUDES', []) libs = target.get('LIBS', []) makeobj.SetProject(project, ptype, defs=defs, incs=incs, libs=libs) - if ptype == 'main': + if ptype == 'main' and tc in ['linux', 'win']: rules += makeobj.GetPepperPlugin() for arch in arches: makeobj.SetArch(arch) diff --git a/native_client_sdk/src/examples/hello_world/example.dsc b/native_client_sdk/src/examples/hello_world/example.dsc index ebefbde..d51a061 100644 --- a/native_client_sdk/src/examples/hello_world/example.dsc +++ b/native_client_sdk/src/examples/hello_world/example.dsc @@ -8,6 +8,7 @@ 'LIBS': ['ppapi', 'pthread'] } ], + 'DATA': ['example.js'], 'DEST': 'examples', 'NAME': 'hello_world', 'TITLE': 'Hello World.', diff --git a/native_client_sdk/src/examples/hello_world/hello_world.c b/native_client_sdk/src/examples/hello_world/hello_world.c index 2d1666e..b53bcc9 100644 --- a/native_client_sdk/src/examples/hello_world/hello_world.c +++ b/native_client_sdk/src/examples/hello_world/hello_world.c @@ -100,7 +100,7 @@ static PP_Bool Instance_DidCreate(PP_Instance instance, const char* argv[]) { const char* post_msg = "Hello World (" TCNAME ")!"; - const char* console_msg = "Hello World (JavsScript Console)!"; + const char* console_msg = "Hello World (JavaScript Console)!"; SendMessage(instance, post_msg); LogMessage(instance, console_msg); |