diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-17 00:15:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-17 00:15:31 +0000 |
| commit | 9c41e894fcd55ea9f64d926b55766baecfc55965 (patch) | |
| tree | 00fa22f10c70cf7d96269dfe8210b2a3208307f3 | |
| parent | fdace49fcdef37deeec202d43e539a6f7a4c38cd (diff) | |
| parent | 5e64accfcf8331d9ce51f7a78bc03f46d9d34350 (diff) | |
| download | libcxx-9c41e894fcd55ea9f64d926b55766baecfc55965.tar.gz | |
Merge "Remove NOTICE symlink." into main
| -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 57fbf9df1..2a7d4846b 100644 --- a/Android.bp +++ b/Android.bp @@ -292,7 +292,6 @@ genrule { visibility: ["//external/musl"], srcs: [ "LICENSE.TXT", - "NOTICE", "include/**/*", ":libcxxabi_headers", ], @@ -301,10 +300,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 " + @@ -314,5 +313,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 |