Snap for 11784721 from 45e6c488a5ad73455d2b70c2ef7d9783cf893dfd to build-tools-releasebuild-tools-release

Change-Id: I45ae03925807b98fd7f059ffa4cbb9cc3075b264

3 files changed, 7 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index d740cea6b..2a7d4846b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -152,10 +152,7 @@ cc_library_shared {
     vendor_available: true,
     product_available: true,
     native_bridge_supported: true,
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
+    double_loadable: true,
     ramdisk_available: true,
     vendor_ramdisk_available: true,
     recovery_available: true,
@@ -295,7 +292,6 @@ genrule {
     visibility: ["//external/musl"],
     srcs: [
         "LICENSE.TXT",
-        "NOTICE",
         "include/**/*",
         ":libcxxabi_headers",
     ],
@@ -304,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 " +
@@ -317,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
diff --git a/OWNERS b/OWNERS
index 1c0d9b851..63747c39e 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,3 @@
-danalbert@google.com
+rprichard@google.com
 srhines@google.com
+pirama@google.com
\ No newline at end of file