Fix licenses and license texts.
Entire project is 1p.
Bug: 210912771
Test: m nothing
Change-Id: I1d76cab983a7d1f9078c0e2f1252f5409692f300
Merged-in: Id941d93786882aca78f214ac692433a353b84ed3
Merged-in: I1d76cab983a7d1f9078c0e2f1252f5409692f300
diff --git a/tests/Android.bp b/tests/Android.bp
index da55c28..6fe447f 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -13,11 +13,7 @@
// 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 "packages_apps_Launcher3_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["packages_apps_Launcher3_license"],
+ default_applicable_licenses: ["Android-Apache-2.0"],
}
filegroup {
diff --git a/tests/Android.mk b/tests/Android.mk
index 6adc685..49d30bf 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -48,7 +48,8 @@
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
+LOCAL_LICENSE_PACKAGE_NAME := Android Launcher3
+LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/dummy_app/Android.bp b/tests/dummy_app/Android.bp
index 4f83bb7..08ce2f7 100644
--- a/tests/dummy_app/Android.bp
+++ b/tests/dummy_app/Android.bp
@@ -15,7 +15,8 @@
//
package {
- default_applicable_licenses: ["packages_apps_Launcher3_license"],
+ // See: http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
}
android_app {