Skip to content

Commit

Permalink
Revert of DevTools: do not use platform/ to load injected scripts int…
Browse files Browse the repository at this point in the history
…o inspector/v8. (patchset #3 id:100001 of https://codereview.chromium.org/1670813003/ )

Reason for revert:
broke https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/14241/steps/generate_build_files/logs/stdio :

GYP_DEFINES='branding=Chrome buildtype=Official use_goma=1 gomadir=/b/build/goma chromeos=1'
python build/gyp_chromium -G output_dir=out
  -> returned 1
Updating projects from gyp files...
Traceback (most recent call last):
  File "tools/jsbundler.py", line 48, in <module>
    import rjsmin
ImportError: No module named rjsmin
gyp: Call to 'python tools/jsbundler.py -r . -r . -r ../../../../../chrome/third_party/chromevox/third_party/closure-library/closure/goog -x testing -x _test.js chromevox/injected/loader.js' returned exit status 1 while in /b/build/slave/google-chrome-rel-chromeos/build/src/chrome/browser/resources/chromeos/chromevox/chromevox.gyp.
step returned non-zero exit code: 1

(also on https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Full https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder%20(dbg) )

Original issue's description:
> DevTools: do not use platform/ to load injected scripts into inspector/v8.
>
> BUG=580337
> TBR=jochen for stray gyp files.
>
> Committed: https://crrev.com/adce7da2534641a5385eabd8f25e9379e4f3ab27
> Cr-Commit-Position: refs/heads/master@{#374046}

[email protected],[email protected],[email protected]
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=580337

Review URL: https://codereview.chromium.org/1676093002

Cr-Commit-Position: refs/heads/master@{#374050}
  • Loading branch information
nico authored and Commit bot committed Feb 7, 2016
1 parent 0d97c97 commit 5f3b8e4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 295 deletions.
7 changes: 7 additions & 0 deletions scripts/concatenate_application_code.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
except ImportError:
import json

rjsmin_path = path.abspath(join(
path.dirname(__file__),
'..',
'..',
'build',
'scripts'))
sys.path.append(rjsmin_path)
import rjsmin


Expand Down
295 changes: 0 additions & 295 deletions scripts/rjsmin.py

This file was deleted.

0 comments on commit 5f3b8e4

Please sign in to comment.