Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769

Original change: https://android-review.googlesource.com/c/platform/development/+/1589100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1d125bf7c5ef4dfb8294fcfe1fec3d2719b6acb

Android.bp

@@ -0,0 +1,48 @@
+//
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["development_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "development_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-CPL-1.0",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-Unicode-DFS",
+        "SPDX-license-identifier-W3C",
+        "legacy_restricted",
+        "legacy_unencumbered",
+    ],
+    // large-scale-change unable to identify any license_text files
+}

apps/BluetoothDebug/Android.bp

@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["development_apps_BluetoothDebug_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_apps_BluetoothDebug_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "BluetoothDebug",
     srcs: ["**/*.java"],

apps/BuildWidget/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "BuildWidget",
     // Only compile source java files in this apk.

apps/CustomLocale/Android.bp

@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["development_apps_CustomLocale_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_apps_CustomLocale_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "CustomLocale",
     srcs: ["**/*.java"],

apps/DevelopmentSettings/Android.bp

@@ -1,3 +1,22 @@
+package {
+    default_applicable_licenses: [
+        "development_apps_DevelopmentSettings_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_apps_DevelopmentSettings_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "DevelopmentSettings",
     sdk_version: "current",

apps/Fallback/Android.bp

@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["development_apps_Fallback_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_apps_Fallback_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "Fallback",
     srcs: ["**/*.java"],

apps/GestureBuilder/Android.bp

@@ -14,6 +14,23 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["development_apps_GestureBuilder_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_apps_GestureBuilder_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_test {
     name: "GestureBuilder",
     srcs: ["**/*.java"],

apps/NinePatchLab/Android.bp

@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["development_apps_NinePatchLab_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_apps_NinePatchLab_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_test {
     name: "NinePatchLab",
     srcs: ["**/*.java"],

apps/PushApiAuthenticator/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app_certificate {
     name: "development_apps_pushapiauthenticator",
     certificate: "cert",

apps/PushApiTestAppOne/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app_certificate {
     name: "development_apps_pushapitestappone_cert",
     certificate: "cert",

apps/PushApiTestAppTwo/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app_certificate {
     name: "development_apps_pushapitestapptwo_cert",
     certificate: "cert",

apps/SdkSetup/Android.bp

@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["development_apps_SdkSetup_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_apps_SdkSetup_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "SdkSetup",
     privileged: true,

apps/SettingInjectorSample/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "SettingInjectorSample",
     // Only compile source java files in this apk.

apps/WidgetPreview/Android.bp

@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "WidgetPreview",
     srcs: ["**/*.java"],

apps/launchperf/Android.bp

@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["development_apps_launchperf_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_apps_launchperf_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_test {
     name: "launchperf",
     srcs: ["**/*.java"],

cmds/monkey/Android.mk

@@ -5,12 +5,18 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_MODULE := monkeylib
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_MODULE_STEM := monkey
 include $(BUILD_JAVA_LIBRARY)
 
 ################################################################
 include $(CLEAR_VARS)
 LOCAL_MODULE := monkey
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := monkey
 LOCAL_REQUIRED_MODULES := monkeylib

gsi/gsi_util/Android.bp

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 python_binary_host {
   name: "gsi_util",
   srcs: [

gsi/repack_super_image/Android.bp

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 python_binary_host {
   name: "repack_super_image",
   main: "repack_super_image.py",

host/windows/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_defaults {
     name: "AdbWinApi_defaults",
 

python-packages/Android.bp

@@ -12,6 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["development_python-packages_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_python-packages_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 python_library_host {
   name: "adb_py",
   srcs: [

samples/AccelerometerPlay/Android.bp

@@ -13,6 +13,25 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: [
+        "development_samples_AccelerometerPlay_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_samples_AccelerometerPlay_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "AccelerometerPlay",
     // Only compile source java files in this apk.

samples/AdaptiveIconSample/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "AdaptiveIconSample",
     // Only compile source java files in this apk.

samples/AliasActivity/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "AliasActivity",
     installable: false,

samples/AndroidBeamDemo/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "AndroidBeamDemo",
     // Only compile source java files in this apk.

samples/AppNavigation/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "AppNavigation",
     srcs: ["src/**/*.java"],

samples/AutofillKeyboard/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "AutofillKeyboard",
     srcs: ["**/*.java"],

samples/BackupRestore/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "BackupRestore",
     // Only compile source java files in this apk.

samples/BasicGLSurfaceView/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "BasicGLSurfaceView",
     // Only compile source java files in this apk.

samples/BluetoothChat/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "BluetoothChat",
     // Only compile source java files in this apk.

samples/BrokenKeyDerivation/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "BrokenKeyDerivation",
     // Only compile source java files in this apk.

samples/BrokenKeyDerivation/tests/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "BrokenKeyDerivationTests",
     srcs: ["**/*.java"],

samples/BusinessCard/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "BusinessCard",
     // Only compile source java files in this apk.

samples/Compass/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "Compass",
     // Only compile source java files in this apk.

samples/ContactManager/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "ContactManager",
     // Only compile source java files in this apk.

samples/CubeLiveWallpaper/Android.bp

@@ -14,6 +14,25 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: [
+        "development_samples_CubeLiveWallpaper_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_samples_CubeLiveWallpaper_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "CubeLiveWallpapers",
     srcs: ["**/*.java"],

samples/DataWiper/Android.bp

@@ -16,6 +16,10 @@
 
 // We build two apps from the same source
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "DataWiper",
     srcs: ["src/**/*.java"],

samples/DeviceAdminWhitelistedAccount/Android.bp

@@ -16,6 +16,10 @@
 
 // We build two apps from the same source
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "DeviceAdminWhitelistedAccount",
     srcs: ["src/**/*.java"],

samples/FixedGridLayout/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "FixedGridLayout",
     srcs: ["**/*.java"],

samples/HelloActivity/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "HelloActivity",
     // Only compile source java files in this apk.

samples/HelloActivity/tests/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "HelloActivityTests",
     srcs: ["**/*.java"],

samples/HelloEffects/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "HelloEffects",
     srcs: ["**/*.java"],

samples/Home/Android.bp

@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["development_samples_Home_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_samples_Home_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "Home",
     srcs: ["**/*.java"],

samples/HoneycombGallery/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "HoneycombGallery",
     // Only compile source java files in this apk.

samples/InlineFillService/Android.bp

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "InlineFillService",
     srcs: [

samples/JetBoy/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "JETBoy",
     srcs: ["**/*.java"],

samples/KeyChainDemo/Android.bp

@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "development_license"
+    // to get the below license kinds:
+    //   legacy_restricted
+    default_applicable_licenses: ["development_license"],
+}
+
 android_app {
     name: "KeyChainDemo",
     // Only compile source java files in this apk.

samples/LceDemo/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "LceDemo",
     // Only compile source java files in this apk.

samples/LunarLander/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "LunarLander",
     // Only compile source java files in this apk.

samples/LunarLander/tests/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "LunarLanderTests",
     srcs: ["**/*.java"],

samples/MultiResolution/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "MultiResolution",
     // Only compile source java files in this apk.

samples/MultiWindow/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "MultiWindow",
     // Only compile source java files in this apk.

samples/NotePad/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "NotePad",
     // Only compile source java files in this apk.

samples/Obb/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "ObbApp",
     // Only compile source java files in this apk.

samples/RSSReader/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "RSSReader",
     srcs: ["**/*.java"],

samples/ReceiveShareDemo/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "ReceiveShareDemo",
     // Only compile source java files in this apk.

samples/SampleSyncAdapter/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "SampleSyncAdapter",
     // Only compile source java files in this apk.

samples/SearchableDictionary/Android.bp

@@ -1,3 +1,13 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "development_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-CPL-1.0
+    default_applicable_licenses: ["development_license"],
+}
+
 android_app {
     name: "SearchableDictionary",
     srcs: ["**/*.java"],

samples/SimpleJNI/Android.bp

@@ -17,6 +17,10 @@
 // This makefile shows how to build a shared library and an activity that
 // bundles the shared library and calls it using JNI.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "SimpleJNI",
     srcs: ["**/*.java"],

samples/SimpleJNI/jni/Android.bp

@@ -17,6 +17,10 @@
 // This makefile supplies the rules for building a library of JNI code for
 // use by our example of how to bundle a shared library with an APK.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_library_shared {
     name: "libsimplejni",
     // All of the source files that we will compile.

samples/SipDemo/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "SipDemo",
     // Only compile source java files in this apk.

samples/SkeletonApp/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "SkeletonApp",
     // Only compile source java files in this apk.

samples/SkeletonApp/tests/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "SkeletonAppTests",
     srcs: ["**/*.java"],

samples/Snake/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "Snake",
     // Only compile source java files in this apk.

samples/Snake/tests/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "SnakeTests",
     srcs: ["**/*.java"],

samples/SoftKeyboard/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "SoftKeyboard",
     srcs: ["**/*.java"],

samples/SpellChecker/HelloSpellChecker/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "HelloSpellChecker",
     srcs: ["**/*.java"],

samples/SpellChecker/SampleSpellCheckerService/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "SampleSpellCheckerService",
     srcs: ["**/*.java"],

samples/StackWidget/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "StackWidget",
     // Only compile source java files in this apk.

samples/ThemedNavBarKeyboard/Android.bp

@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "ThemedNavBarKeyboard",
     srcs: ["**/*.java"],

samples/ToyVpn/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "ToyVpn",
     // Only compile source java files in this apk.

samples/TtsEngine/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "TtsEngine",
     srcs: ["src/**/*.java"],

samples/USB/AdbTest/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "AdbTest",
     srcs: ["**/*.java"],

samples/USB/MissileLauncher/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "MissileLauncher",
     srcs: ["**/*.java"],

samples/UiAutomator/Android.mk

@@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := uiautomator.samples
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_JAVA_LIBRARIES := uiautomator.core android.test.base.stubs
 LOCAL_STATIC_JAVA_LIBRARIES := junit

samples/Vault/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test_helper_app {
     name: "Vault",
     srcs: ["**/*.java"],

samples/Vault/tests/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "VaultTests",
     libs: [

samples/VoiceRecognitionService/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "VoiceRecognitionService",
     srcs: ["**/*.java"],

samples/VoicemailProviderDemo/Android.bp

@@ -14,6 +14,25 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: [
+        "development_samples_VoicemailProviderDemo_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "development_samples_VoicemailProviderDemo_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "VoicemailProviderDemo",
     // Only compile source java files in this apk.

samples/WeatherListWidget/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "WeatherListWidget",
     // Only compile source java files in this apk.

samples/WiFiDirectDemo/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "WiFiDirectDemo",
     // Only compile source java files in this apk.

samples/WiFiDirectServiceDiscovery/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "WiFiDirectServiceDiscovery",
     // Only compile source java files in this apk.

samples/Wiktionary/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "Wiktionary",
     // Only compile source java files in this apk.

samples/WiktionarySimple/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "WiktionarySimple",
     // Only compile source java files in this apk.

samples/XmlAdapters/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "xmladapters",
     // Only compile source java files in this apk.

samples/apkcachetest/Android.bp

@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "ApkCacheTest",
     srcs: ["src/**/*.java"],

samples/training/NsdChat/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "NsdChat",
     // Only compile source java files in this apk.

scripts/Android.bp

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 python_library_host {
     name: "python-symbol",
     srcs: [

sdk/Android.bp

@@ -1,3 +1,16 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "development_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-BSD
+    //   SPDX-license-identifier-CPL-1.0
+    //   SPDX-license-identifier-MIT
+    //   SPDX-license-identifier-Unicode-DFS
+    //   SPDX-license-identifier-W3C
+    default_applicable_licenses: ["development_license"],
+}
+
 genrule {
     name: "platform_tools_version",
     cmd: "sed 's/$${PLATFORM_SDK_VERSION}/0/ ; s/^Pkg.Revision=\\(.*\\)/#define PLATFORM_TOOLS_VERSION \"\\1\"/p ; d' $(in) > $(out)",

testrunner/Android.mk

@@ -10,6 +10,8 @@ LOCAL_PATH := $(call my-dir)
 ########################
 include $(CLEAR_VARS)
 LOCAL_MODULE := test_defs.xml
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(local_target_dir)
@@ -18,6 +20,8 @@ include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := coverage_targets.xml
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(local_target_dir)

testrunner/tests/Android_native.mk

@@ -15,6 +15,8 @@
 include $(CLEAR_VARS)
 test_module := foo
 LOCAL_MODULE := $(test_module)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 recursive_var := $(recursive_var)
 LOCAL_MODULE_TAGS := tags
 LOCAL_SRC_FILES := src

tools/Android.bp

@@ -1 +1,11 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "development_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   legacy_unencumbered
+    default_applicable_licenses: ["development_license"],
+}
+
 subdirs = ["*"]

tools/apkcheck/Android.bp

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_binary_host {
     name: "apkcheck",
     wrapper: "etc/apkcheck",

tools/bugreport/Android.bp

@@ -1,6 +1,10 @@
 // Copyright 2006 The Android Open Source Project
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_binary_host {
     name: "BugReport",
     wrapper: "bugreport",

tools/etc1tool/Android.bp

@@ -3,6 +3,10 @@
 // Android.mk for etc1tool
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_binary_host {
     name: "etc1tool",
 

tools/idegen/Android.bp

@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_library_host {
     name: "idegen",
     srcs: ["**/*.java"],

tools/line_endings/Android.bp

@@ -2,6 +2,15 @@
 //
 // Copies files into the directory structure described by a manifest
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "development_license"
+    // to get the below license kinds:
+    //   legacy_restricted
+    default_applicable_licenses: ["development_license"],
+}
+
 cc_binary_host {
     name: "line_endings",
     srcs: ["line_endings.c"],

tools/mkstubs/Android.bp

@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_library_host {
     name: "mkstubs",
     srcs: ["src/**/*.java"],

tools/rmtypedefs/Android.bp

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_binary_host {
     name: "rmtypedefs",
     srcs: ["src/**/*.java"],

vndk/Android.bp

@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 subdirs = [
     "tools",
 ]

vndk/tools/Android.bp

@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 subdirs = [
     "header-checker",
     "vtable-dumper",