Snap for 7160059 from c03c23b734ccf6860a3f9623c736295ab76067e7 to sc-v2-release
Change-Id: I3c34439bbba57d8b7a5700a28f3536cd6e25cd24
diff --git a/Android.bp b/Android.bp
index fc5a8a9..0ac28da 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,10 @@
// limitations under the License.
// A static library containing all the source needed by a Time Zone Data app.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
java_library {
name: "time_zone_distro_provider",
diff --git a/oem_template/data_app_prebuilt/include_app_prebuilt.mk b/oem_template/data_app_prebuilt/include_app_prebuilt.mk
index 3ebc464..ec9939a 100644
--- a/oem_template/data_app_prebuilt/include_app_prebuilt.mk
+++ b/oem_template/data_app_prebuilt/include_app_prebuilt.mk
@@ -22,6 +22,8 @@
#
LOCAL_MODULE := TimeZoneDataPrebuilt$(TIME_ZONE_DATA_APP_SUFFIX)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := TimeZoneData$(TIME_ZONE_DATA_APP_SUFFIX).apk
LOCAL_OVERRIDES_PACKAGES := TimeZoneData$(TIME_ZONE_DATA_APP_SUFFIX)
LOCAL_MODULE_TAGS := optional
diff --git a/oem_template/xts/Android.mk b/oem_template/xts/Android.mk
index 25be082..d5ceeeb 100644
--- a/oem_template/xts/Android.mk
+++ b/oem_template/xts/Android.mk
@@ -23,6 +23,8 @@
# OEM-INSTRUCTION: OEMs should change this
LOCAL_MODULE := XtsTimeZoneTestCases
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_STATIC_JAVA_LIBRARIES := time_zone_data_app_testing
diff --git a/testing/xts/Android.bp b/testing/xts/Android.bp
index 538595b..735a1c5 100644
--- a/testing/xts/Android.bp
+++ b/testing/xts/Android.bp
@@ -16,6 +16,10 @@
// OEMs can include this as a "_STATIC_" dependency and anything else needed to integrate with their
// own test suite. At runtime the libs below (or a superset) must be present.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
java_library_host {
name: "time_zone_data_app_testing",
srcs: ["src/**/*.java"],