summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-04-08 02:11:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-08 02:11:12 +0000
commitcadcfdb292f1c2c5f44d4b29c66dee57ea2fdf68 (patch)
tree6621b6952ad252af0be75bb05b50f4b97ff20686
parent1b92889acfbc85790c35849eed40a33a57fd8c41 (diff)
parent322bce65051688e7c346cebfbe1f9c2b49f8af5f (diff)
downloadsecurity-cadcfdb292f1c2c5f44d4b29c66dee57ea2fdf68.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/security" am: 4e005bddd1 am: 81da41c94e am: 322bce6505
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2058510 Change-Id: Ibf2437481f75959fab48626509d85663b52a3284 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--keystore2/tests/legacy_blobs/Android.bp9
1 files changed, 9 insertions, 0 deletions
diff --git a/keystore2/tests/legacy_blobs/Android.bp b/keystore2/tests/legacy_blobs/Android.bp
index 2f48d7f2..9322a411 100644
--- a/keystore2/tests/legacy_blobs/Android.bp
+++ b/keystore2/tests/legacy_blobs/Android.bp
@@ -12,6 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "system_security_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_security_license"],
+}
+
rust_test {
name: "keystore2_legacy_blobs_test",
srcs: ["keystore2_legacy_blob_tests.rs"],