Merge SP1A.210222.001
Change-Id: I5b732107544ef40518e03b7c7084ef54f865006d
diff --git a/Android.bp b/Android.bp
index 7f83ff2..9b12815 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,22 @@
// This file is generated by cargo2android.py --run --dependencies --device --features=bytes --copy-out --patch=patches/Android.bp.patch.
+package {
+ default_applicable_licenses: ["external_rust_crates_protobuf_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "external_rust_crates_protobuf_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "LICENSE.txt",
+ ],
+}
+
genrule {
name: "copy_protobuf_build_out",
srcs: ["out/*"],
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index fe12edb..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by cargo2android.py for tests in Android.bp
-{
- "presubmit": [
- {
- "host": true,
- "name": "protobuf-codegen_host_test_src_lib"
- }
- ]
-}