diff options
| author | earthdok <earthdok@chromium.org> | 2014-09-24 11:11:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 18:12:12 +0000 |
| commit | e28696420fcac7596c9262868b93f16c1231e0ea (patch) | |
| tree | 6172e61ae2b15060341e2abd27f0ed992083e1b0 /third_party/instrumented_libraries/scripts | |
| parent | a400e5663a1c116a53296777d11633163484b501 (diff) | |
| download | chromium_src-e28696420fcac7596c9262868b93f16c1231e0ea.zip chromium_src-e28696420fcac7596c9262868b93f16c1231e0ea.tar.gz chromium_src-e28696420fcac7596c9262868b93f16c1231e0ea.tar.bz2 | |
Re-land r296395: "Instrumented libraries: update the libnspr4 build script."
There has been a security update in gPrecise which changed the paths somewhat.
The previous version of this CL was reverted as it broke on vanilla Precise.
This version fixes that.
BUG=313751
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/602823002
Cr-Commit-Position: refs/heads/master@{#296466}
Diffstat (limited to 'third_party/instrumented_libraries/scripts')
| -rwxr-xr-x | third_party/instrumented_libraries/scripts/libnspr4.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/third_party/instrumented_libraries/scripts/libnspr4.sh b/third_party/instrumented_libraries/scripts/libnspr4.sh index 9ca669c..07b7908 100755 --- a/third_party/instrumented_libraries/scripts/libnspr4.sh +++ b/third_party/instrumented_libraries/scripts/libnspr4.sh @@ -5,4 +5,13 @@ # This script does some preparations before build of instrumented libnspr4. -mv mozilla/nsprpub/* . +if [ -d nspr ] +then + mv nspr/* . +elif [ -d mozilla/nsprpub ] +then + mv mozilla/nsprpub/* . +else + echo "libnspr4.sh: package has unexpected directory structure. Please update this script." + return 1 +fi |