Revert 155693 - DEPS roll plus copy list update.

Revert 155693 - DEPS roll plus copy list update.
This broke the ChromiumOS (daisy) bot.

We require some files now to be copied on the chrome side.
Also we require some new include_dirs previously injected.

BUG=None
TEST=None
TBR=noelallen@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10914169

TBR=bradnelson@google.com
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=155696

[bradn, 2012-09-10 21:58:31]

LGTM
sorry for all the havoc.



On Mon, Sep 10, 2012 at 3:17 AM, <peter@chromium.org> wrote:

> Reviewers: bradn,
>
> Description:
> Revert 155693 - DEPS roll plus copy list update.
> This broke the ChromiumOS (daisy) bot.
>
> We require some files now to be copied on the chrome side.
> Also we require some new include_dirs previously injected.
>
> BUG=None
> TEST=None
> TBR=noelallen@chromium.org
>
>
> Review URL:
https://chromiumcodereview.**appspot.com/10914169<https://chromiumcodereview....
>
> TBR=bradnelson@google.com
>
> Please review this at
https://chromiumcodereview.**appspot.com/10912175/<https://chromiumcodereview...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src/<http://svn.chromium.org/chrome/trunk/src/>
>
> Affected files:
>   M     DEPS
>   MM    ppapi/native_client/native_**client.gyp
>   M     ppapi/native_client/src/**untrusted/irt_stub/irt_stub.**gyp
>   M     ppapi/native_client/src/**untrusted/pnacl_irt_shim/**
> pnacl_irt_shim.gyp
>   M     ppapi/ppapi_untrusted.gyp
>
>
> Index: DEPS
> ==============================**==============================**=======
> --- DEPS        (revision 155695)
> +++ DEPS        (working copy)
> @@ -12,7 +12,7 @@
>    "chromium_git": "http://git.chromium.org/git",
>    "chromiumos_git":
"http://git.chromium.org/**chromiumos<http://git.chromium.org/chromiumos>
> ",
>    "swig_revision": "69281",
> -  "nacl_revision": "9684",
> +  "nacl_revision": "9651",
>    # After changing nacl_revision, run 'glient sync' and check
> native_client/DEPS
>    # to update other nacl_*_revision's.
>    "nacl_tools_revision": "9330",  # native_client/DEPS: tools_rev
> @@ -585,6 +585,7 @@
>      "action": [
>          "python", "src/build/download_nacl_**toolchains.py",
>           "--no-arm-trusted",
> +         "--optional-pnacl",
>           "--save-downloads-dir",
>               "src/native_client_sdk/src/**build_tools/toolchain_**
> archives",
>           "--keep",
> Index: ppapi/native_client/native_**client.gyp
> ==============================**==============================**=======
> --- ppapi/native_client/native_**client.gyp       (revision 155695)
> +++ ppapi/native_client/native_**client.gyp       (working copy)
> @@ -16,27 +16,10 @@
>               '../../native_client/src/**untrusted/pthread/pthread.gyp:**
> pthread_lib',
>               'src/untrusted/irt_stub/irt_**stub.gyp:ppapi_stub_lib',
>            ],
> -          'include_dirs': [
> -            '..',
> -          ],
> +          # Here we copy linker scripts out of the Native Client
> repository.
> +          # These are source, not build artifacts.
>            'copies': [
>              {
> -              'destination': '<(SHARED_INTERMEDIATE_DIR)/**
> tc_newlib/include/nacl',
> -              'files': [
> -                  'src/trusted/weak_ref/call_on_**main_thread.h',
> -                  'src/shared/ppapi_proxy/**ppruntime.h',
> -              ],
> -            },
> -            {
> -              'destination': '<(SHARED_INTERMEDIATE_DIR)/**
> tc_glibc/include/nacl',
> -              'files': [
> -                  'src/trusted/weak_ref/call_on_**main_thread.h',
> -                  'src/shared/ppapi_proxy/**ppruntime.h',
> -              ],
> -            },
> -            # Here we copy linker scripts out of the Native Client
> repository.
> -            # These are source, not build artifacts.
> -            {
>                'destination': '<(SHARED_INTERMEDIATE_DIR)/**
> tc_newlib/lib32',
>                'files': [
>                    'src/untrusted/irt_stub/**libppapi.a',
>
> Property changes on: ppapi/native_client/native_**client.gyp
> ______________________________**______________________________**_______
> Deleted: svn:mergeinfo
>
> Index: ppapi/native_client/src/**untrusted/irt_stub/irt_stub.**gyp
> ==============================**==============================**=======
> --- ppapi/native_client/src/**untrusted/irt_stub/irt_stub.**gyp
> (revision 155695)
> +++ ppapi/native_client/src/**untrusted/irt_stub/irt_stub.**gyp
> (working copy)
> @@ -15,9 +15,6 @@
>          'build_glibc': 1,
>          'build_newlib': 1,
>        },
> -      'include_dirs': [
> -        '../../../..',
> -      ],
>        'sources': [
>          'ppapi_plugin_main.c',
>          'ppapi_plugin_start.c',
> Index: ppapi/native_client/src/**untrusted/pnacl_irt_shim/**
> pnacl_irt_shim.gyp
> ==============================**==============================**=======
> --- ppapi/native_client/src/**untrusted/pnacl_irt_shim/**pnacl_irt_shim.gyp
> (revision 155695)
> +++ ppapi/native_client/src/**untrusted/pnacl_irt_shim/**pnacl_irt_shim.gyp
> (working copy)
> @@ -22,9 +22,6 @@
>            'shim_entry.c',
>            'shim_ppapi.c',
>          ],
> -        'include_dirs': [
> -          '../../../..',
> -        ],
>        },
>        'dependencies': [
>          '<(DEPTH)/native_client/tools.**gyp:prep_toolchain',
> Index: ppapi/ppapi_untrusted.gyp
> ==============================**==============================**=======
> --- ppapi/ppapi_untrusted.gyp   (revision 155695)
> +++ ppapi/ppapi_untrusted.gyp   (working copy)
> @@ -54,7 +54,9 @@
>          'link_flags': [
>            '-lppapi_cpp',
>            '-lppapi',
> +          '-lplatform',
>            '-lpthread',
> +          '-lgio',
>          ],
>          # TODO(bradchen): get rid of extra_deps64 and extra_deps32
>          # once native_client/build/untrusted.**gypi no longer needs them.
>
>
>