diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 23:46:53 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 23:46:53 +0000 |
| commit | 38fa08719c97f7cd60c3379883488cb50b6fcb73 (patch) | |
| tree | a395ecb45d04cd9a5441022c646ac6dbfb471ecf /native_client_sdk | |
| parent | bbe5dbb08d3f3fb8e9528bc0dc07a49a62b9d1d5 (diff) | |
| download | chromium_src-38fa08719c97f7cd60c3379883488cb50b6fcb73.zip chromium_src-38fa08719c97f7cd60c3379883488cb50b6fcb73.tar.gz chromium_src-38fa08719c97f7cd60c3379883488cb50b6fcb73.tar.bz2 | |
[NaCl SDK] Fix verification errors.
Also add verification build step.
BUG=none
TBR=sbc@chromium.org
Review URL: https://codereview.chromium.org/14649026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 10 | ||||
| -rw-r--r-- | native_client_sdk/src/build_tools/sdk_files.list | 12 |
2 files changed, 8 insertions, 14 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 67274a1..1ebf88d 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -706,6 +706,13 @@ def GenerateNotice(fileroot, output_filename='NOTICE', extra_files=None): generate_notice.Generate(output_filename, fileroot, license_files) +def BuildStepVerifyFilelist(pepperdir, platform): + buildbot_common.BuildStep('Verify SDK Files') + verify_filelist.Verify(platform, os.path.join(SCRIPT_DIR, 'sdk_files.list'), + pepperdir) + print 'OK' + + def BuildStepTarBundle(pepper_ver, tarfile): buildbot_common.BuildStep('Tar Pepper Bundle') buildbot_common.MakeDir(os.path.dirname(tarfile)) @@ -932,8 +939,7 @@ def main(args): GenerateNotice(pepperdir) # Verify the SDK contains what we expect. - verify_filelist.Verify(platform, os.path.join(SCRIPT_DIR, 'sdk_files.list'), - pepperdir) + BuildStepVerifyFilelist(pepperdir, platform) if not options.skip_tar: BuildStepTarBundle(pepper_ver, tarfile) diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list index 7cc0fea..b28acc6 100644 --- a/native_client_sdk/src/build_tools/sdk_files.list +++ b/native_client_sdk/src/build_tools/sdk_files.list @@ -414,19 +414,7 @@ include/ppapi/cpp/var.h include/ppapi/cpp/view.h include/ppapi/cpp/websocket.h include/ppapi/gles2/gl2ext_ppapi.h -include/ppapi/lib/gl/egl/egldriver.c -include/ppapi/lib/gl/egl/egldriver_ppapi.c -include/ppapi/lib/gl/gles2/gl2ext_ppapi.c include/ppapi/lib/gl/gles2/gl2ext_ppapi.h -include/ppapi/lib/gl/gles2/gles2.c -include/ppapi/lib/gl/gl.gyp -include/ppapi/lib/gl/include/EGL/eglext.h -include/ppapi/lib/gl/include/EGL/egl.h -include/ppapi/lib/gl/include/EGL/eglplatform.h -include/ppapi/lib/gl/include/GLES2/gl2ext.h -include/ppapi/lib/gl/include/GLES2/gl2.h -include/ppapi/lib/gl/include/GLES2/gl2platform.h -include/ppapi/lib/gl/include/KHR/khrplatform.h include/ppapi_main/ppapi_event.h include/ppapi_main/ppapi_instance2d.h include/ppapi_main/ppapi_instance3d.h |