Snap for 10929834 from a0ad49e1207936fb7dd1e6477f9d6f3e7bb9737a to sdk-release

Change-Id: I8ed190b637b1b43bd7dc61629b93c0dec031a336

3 files changed, 57 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..66bd177
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,45 @@
+//
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["external_rust_beto-rust_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "external_rust_beto-rust_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "legacy_unencumbered",
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-Unlicense",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
diff --git a/nearby/Android.bp b/nearby/Android.bp
index 022a70d..548f005 100644
--- a/nearby/Android.bp
+++ b/nearby/Android.bp
@@ -1,3 +1,14 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_rust_beto-rust_license"
+    // to get the below license kinds:
+    //   legacy_unencumbered
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-Unlicense
+    default_applicable_licenses: ["external_rust_beto-rust_license"],
+}
+
 rust_library_rlib {
     name: "libcrypto_provider",
     host_supported: true,
@@ -223,4 +234,3 @@ java_library_static {
         "libukey2_jni_shared",
     ],
 }
-
diff --git a/nearby/cargo2android.json b/nearby/cargo2android.json
index 8072e3f..84e42b8 100644
--- a/nearby/cargo2android.json
+++ b/nearby/cargo2android.json
@@ -1,4 +1,5 @@
 {
+    "patch": "patches/Android.bp.patch",
     "device": true,
     "run": true,
     "features": "openssl,boringssl",