diff options
| author | Elliott Hughes <enh@google.com> | 2024-04-12 18:48:25 +0000 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2024-04-12 21:45:21 +0000 |
| commit | 5e64accfcf8331d9ce51f7a78bc03f46d9d34350 (patch) | |
| tree | 6451182082432cee2379c1121519ed7949dba7e9 | |
| parent | f5d9b62fb0e250f6f941e21f1d4676baed8244c6 (diff) | |
| download | libcxx-5e64accfcf8331d9ce51f7a78bc03f46d9d34350.tar.gz | |
Remove NOTICE symlink.
The .bp file explicitly points to upstream's LICENSE.TXT file.
Also fix up a genrule that referred to NOTICE to refer to LICENSE.TXT
directly.
Test: treehugger
Change-Id: Ifb01ea4444b8e0288fe24ccb0fa63ebd3e8761ec
| -rw-r--r-- | Android.bp | 9 | ||||
| l--------- | NOTICE | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index d740cea6b..4f9794f12 100644 --- a/Android.bp +++ b/Android.bp @@ -295,7 +295,6 @@ genrule { visibility: ["//external/musl"], srcs: [ "LICENSE.TXT", - "NOTICE", "include/**/*", ":libcxxabi_headers", ], @@ -304,10 +303,10 @@ genrule { "soong_zip", "zip2zip", ], - cmd: "LIBCXX_DIR=$$(dirname $(location NOTICE)) && " + + cmd: "LIBCXX_DIR=$$(dirname $(location LICENSE.TXT)) && " + "$(location soong_zip) -o $(genDir)/sysroot.zip -symlinks=false" + - // NOTICE - " -j -f $(location NOTICE) " + + // LICENSE.TXT + " -j -f $(location LICENSE.TXT) " + // headers " -P include/c++ " + " -C $${LIBCXX_DIR}/include " + @@ -317,5 +316,5 @@ genrule { " -x include/c++/CMakeLists.txt" + " -x include/c++/module.modulemap " + " include/**/*:include " + - " NOTICE:NOTICE.libc++", + " LICENSE.TXT:LICENSE.libc++", } diff --git a/NOTICE b/NOTICE deleted file mode 120000 index 2acbe4513..000000000 --- a/NOTICE +++ /dev/null @@ -1 +0,0 @@ -LICENSE.TXT
\ No newline at end of file |