summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2022-06-30 21:14:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-30 21:14:44 +0000
commit84265710a9c0add05be5a2e31aa50c39385e764c (patch)
tree689397613a0b5fc02d599285c6c8246750ecdb86
parent17d3a5cfa77952f7437760469a7b79a1736cf6a1 (diff)
parent763a73a911059cff16b400e36110384b8b3c6995 (diff)
downloadmobile-data-download-84265710a9c0add05be5a2e31aa50c39385e764c.tar.gz
[LSC] Add LOCAL_LICENSE_KINDS to external/mobile-data-download am: ea5b701af8 am: 13e28c8948 am: fd87a552d6 am: 4e57b61f42 am: 763a73a911
Original change: https://android-review.googlesource.com/c/platform/external/mobile-data-download/+/2141235 Change-Id: I5dedade08ba2d31a1ec78c23d7bc688acbc9ac8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp11
-rw-r--r--proto/Android.bp11
2 files changed, 20 insertions, 2 deletions
diff --git a/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp b/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp
index 342a337..db31e28 100644
--- a/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp
+++ b/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp
@@ -15,6 +15,15 @@
// 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 "mobile_data_downloader_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["mobile_data_downloader_license"],
+}
+
java_library {
name: "mobile-data-download-populator-java-proto-lite",
proto: {
@@ -36,4 +45,4 @@ java_library {
"//apex_available:platform",
"com.android.adservices",
],
-} \ No newline at end of file
+}
diff --git a/proto/Android.bp b/proto/Android.bp
index 5de4478..f3f5e71 100644
--- a/proto/Android.bp
+++ b/proto/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 "mobile_data_downloader_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["mobile_data_downloader_license"],
+}
+
java_library {
name: "mobile-data-download-java-proto-lite",
proto: {
@@ -33,4 +42,4 @@ java_library {
"//apex_available:platform",
"com.android.adservices",
],
-} \ No newline at end of file
+}