summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorjvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 23:11:33 +0000
committerjvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 23:11:33 +0000
commitf7c2871cb76742220ec4708e8ee0a68491a7c4f4 (patch)
treeb96bbac7c1389262f0e7f9b70a69422a6bb275ea /ppapi
parent6466a4d7c8dc95a41beb25bfffcfb7061b809ff2 (diff)
downloadchromium_src-f7c2871cb76742220ec4708e8ee0a68491a7c4f4.zip
chromium_src-f7c2871cb76742220ec4708e8ee0a68491a7c4f4.tar.gz
chromium_src-f7c2871cb76742220ec4708e8ee0a68491a7c4f4.tar.bz2
Add support in NaClBrowserTests for PNaCl, and test PNaCl UMA.
Mostly the same as the previous CL from dschuff: https://chromiumcodereview.appspot.com/11348048 Updated to only build pexes, and test the in-browser translation of the pexe instead of pre-translating the pexes (so create_nmf calls are different, etc.). Add some UMA tests for PNaCl while we are at it. NOTE: Tests are disabled under ASAN. BUG=https://code.google.com/p/chromium/issues/detail?id=171810 In a later CL we can enable a test for pnacl_coordinator under asan, but using incognito mode, which avoids the caching logic. BUG= http://code.google.com/p/nativeclient/issues/detail?id=2484 BUG= http://code.google.com/p/nativeclient/issues/detail?id=3136 Review URL: https://chromiumcodereview.appspot.com/11956028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/native_client/native_client.gyp6
-rw-r--r--ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp1
-rw-r--r--ppapi/ppapi_untrusted.gyp2
3 files changed, 9 insertions, 0 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index 1a57280..dc834d9 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -68,6 +68,12 @@
'src/untrusted/irt_stub/libppapi.a',
],
},
+ {
+ 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib/lib',
+ 'files': [
+ 'src/untrusted/irt_stub/libppapi.a',
+ ],
+ },
],
},
{
diff --git a/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp b/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp
index 951dd32..2259578 100644
--- a/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp
+++ b/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp
@@ -14,6 +14,7 @@
'nlib_target': 'libppapi_stub.a',
'build_glibc': 1,
'build_newlib': 1,
+ 'build_pnacl_newlib': 1,
},
'include_dirs': [
'../../../..',
diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp
index e28e289..bfbf09e 100644
--- a/ppapi/ppapi_untrusted.gyp
+++ b/ppapi/ppapi_untrusted.gyp
@@ -20,6 +20,7 @@
'nso_target': 'libppapi_cpp.so',
'build_glibc': 1,
'build_newlib': 1,
+ 'build_pnacl_newlib': 1,
'sources': [
'<@(cpp_source_files)',
'cpp/module_embedder.h',
@@ -38,6 +39,7 @@
'nso_target': 'libppapi_gles2.so',
'build_glibc': 1,
'build_newlib': 1,
+ 'build_pnacl_newlib': 1,
'include_dirs': [
'lib/gl/include',
],