summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 04:56:24 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 04:56:24 +0000
commitc8e6e0315bb6d79b4a656746e76e35607c7909a4 (patch)
tree58860f9e332410ab89db0730585820af6ce5c448
parente52bdcae4de08d978b2a339b7fb0716ae6552fbd (diff)
parent824f349a0225e1a67e4cbbacd81e34755c1d8f97 (diff)
downloadmobile-data-download-c8e6e0315bb6d79b4a656746e76e35607c7909a4.tar.gz
Snap for 10453563 from 824f349a0225e1a67e4cbbacd81e34755c1d8f97 to mainline-mediaprovider-releaseaml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000
Change-Id: I2cef2106710ed94357ada905c17127d72d947dc3
-rw-r--r--Android.bp7
-rw-r--r--java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp9
-rw-r--r--proto/Android.bp9
3 files changed, 24 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 94e0c34..d52d055 100644
--- a/Android.bp
+++ b/Android.bp
@@ -119,7 +119,12 @@ android_library {
],
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: {