diff options
| author | Dan Albert <danalbert@google.com> | 2018-04-24 15:40:46 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2018-04-25 15:38:08 -0700 |
| commit | 15b8cae36530000b68bda0bd227f00b803e57a51 (patch) | |
| tree | fba7459ea7d1d30190d5cbc895d7a2e00881822c /build/tools | |
| parent | d932a85ca77b81a944f1ddc4eb40f2a0180179e4 (diff) | |
| download | ndk-15b8cae36530000b68bda0bd227f00b803e57a51.tar.gz | |
Merge NOTICE files into two top level NOTICEs.
Test: ./checkbuild.py
Test: less NOTICE
Test: less NOTICE.toolchain
Bug: None
Change-Id: Ie00060b0a364a15450ef8e41516592c5aa759e82
Diffstat (limited to 'build/tools')
| -rwxr-xr-x | build/tools/build-gdbserver.sh | 4 | ||||
| -rwxr-xr-x | build/tools/build-shader-tools.py | 19 |
2 files changed, 0 insertions, 23 deletions
diff --git a/build/tools/build-gdbserver.sh b/build/tools/build-gdbserver.sh index 6d81a690d..a9e7dc280 100755 --- a/build/tools/build-gdbserver.sh +++ b/build/tools/build-gdbserver.sh @@ -276,7 +276,3 @@ run ${TOOLCHAIN_PREFIX}objcopy --strip-unneeded \ fail_panic "Could not install $DSTFILE." make_repo_prop "$INSTALL_DIR" -cp "$SRC_DIR/../../COPYING" "$INSTALL_DIR/NOTICE" -fail_panic "Could not copy license file!" - -dump "Done." diff --git a/build/tools/build-shader-tools.py b/build/tools/build-shader-tools.py index 76ed46fbf..1f722a379 100755 --- a/build/tools/build-shader-tools.py +++ b/build/tools/build-shader-tools.py @@ -92,25 +92,6 @@ def main(args): except: pass - # Create the NOTICE file. - license_files = [ - os.path.join(shaderc_shaderc_dir, 'LICENSE'), - os.path.join(shaderc_shaderc_dir, - 'third_party', - 'LICENSE.spirv-tools'), - os.path.join(shaderc_shaderc_dir, - 'third_party', - 'LICENSE.glslang'), - ] - # The SPIRV-Headers might not have landed just yet. Use its - # license file if it exists. - spirv_headers_license = os.path.join(spirv_headers_dir, 'LICENSE') - if os.path.exists(spirv_headers_license): - license_files.append(spirv_headers_license) - - build_support.merge_license_files(os.path.join(package_src, 'NOTICE'), - license_files) - cmake_command = [cmake, '-GNinja', '-DCMAKE_MAKE_PROGRAM=' + ninja, '-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_INSTALL_PREFIX=' + install_dir, |