Snap for 7550930 from 725dacf0b91e6253621645dcd420144011bd516a to mainline-captiveportallogin-releaseandroid-mainline-12.0.0_r6android-mainline-12.0.0_r23android12-mainline-captiveportallogin-release

Change-Id: Ib37e21b286c8b7fb00a0dd74d81b2b566220bf17

3 files changed, 22 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index a27ced2..69260b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["external_cblas_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_cblas_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_defaults {
     name: "cblas-defaults",
     srcs: [
@@ -168,12 +185,13 @@ cc_defaults {
 
 cc_library_shared {
     name: "libblas",
-    vendor_available: false,
+    vendor_available: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
     vndk: {
         enabled: true,
         support_system_process: true,
+        private: true,
     },
     defaults: ["cblas-defaults"],
     static_libs: ["libF77blas"],
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index ffb237c..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,14 +0,0 @@
-The reference BLAS is a freely-available software package. It is
-available from netlib via anonymous ftp and the World Wide Web. Thus,
-it can be included in commercial software packages (and has been). We
-only ask that proper credit be given to the authors.
-
-Like all software, it is copyrighted. It is not trademarked, but we do
-ask the following:
-
-If you modify the source for these routines we ask that you change the
-name of the routine and comment the changes made to the original.
-
-We will gladly answer any questions regarding the software. If a
-modification is done, however, it is the responsibility of the person
-who modified the routine to provide support