| OLD | NEW |
|---|
| 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 BuildStep() { | 5 BuildStep() { |
| 6 # Nothing to build. | 6 # Nothing to build. |
| 7 return | 7 return |
| 8 } | 8 } |
| 9 | 9 |
| 10 InstallStep() { | 10 InstallStep() { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 # Remove shared objects which are symlinked after we resolve them. | 54 # Remove shared objects which are symlinked after we resolve them. |
| 55 find . -name '*.so.*.*' -exec rm -f {} \; | 55 find . -name '*.so.*.*' -exec rm -f {} \; |
| 56 | 56 |
| 57 MakeDir lib | 57 MakeDir lib |
| 58 # Copy core libraries | 58 # Copy core libraries |
| 59 LogExecute cp -r ${NACL_SDK_LIB}/*.a lib/ | 59 LogExecute cp -r ${NACL_SDK_LIB}/*.a lib/ |
| 60 LogExecute cp -r ${NACL_SDK_LIB}/*.o lib/ | 60 LogExecute cp -r ${NACL_SDK_LIB}/*.o lib/ |
| 61 | 61 |
| 62 # Copy SDK libs | 62 # Copy SDK libs |
| 63 LogExecute cp -r ${NACL_SDK_LIBDIR}/*.a lib/ | 63 LogExecute cp -r ${NACL_SDK_LIBDIR}/*.a lib/ |
| 64 LogExecute rm -fr lib/libgtest.*a | |
| 65 LogExecute rm -fr lib/libgmock.*a | |
| 66 | 64 |
| 67 # Copy in SDK includes. | 65 # Copy in SDK includes. |
| 68 LogExecute cp -r ${NACL_SDK_ROOT}/include ./ | 66 LogExecute cp -r ${NACL_SDK_ROOT}/include ./ |
| 69 LogExecute rm -fr include/gtest | |
| 70 LogExecute rm -fr include/gmock | |
| 71 } | 67 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1555913002:
Build gtest from source rather than using SDK-provided version (Closed)
Base URL: https://chromium.googlesource.com/webports.git@master