Merge "Rb back compat: Base changes" into tm-mainline-prod am: 82c1901ee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mobile-data-download/+/21185749
Change-Id: If5212300df4b612c9f54ca61e9f5b1414c3fa7dd
Merged-In: I366d3778a3983aa83537ec20a213586312448d12
Signed-off-by: Automerger Merge Worker <[email protected]>
Bug: 263816046
Ignore-AOSP-First: Automerger fix
diff --git a/Android.bp b/Android.bp
index fa5dc9a..4324928 100644
--- a/Android.bp
+++ b/Android.bp
@@ -116,7 +116,12 @@
],
visibility: [
"//packages/modules/AdServices:__subpackages__",
- "//packages/modules/OnDevicePersonalization:__subpackages__",
+ "//packages/modules/OnDevicePersonalization:__subpackages__",
":__subpackages__",
],
+ errorprone: {
+ javacflags: [
+ "-Xep:NoCanIgnoreReturnValueOnClasses:WARN",
+ ],
+ },
}
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 4d4bf99..1110b02 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: {
diff --git a/proto/Android.bp b/proto/Android.bp
index 5e22797..40a3017 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: {
