diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-21 19:04:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-21 19:04:22 +0000 |
| commit | 97ce1519dbede8ee1acda75fbe8195f9d69bfdff (patch) | |
| tree | f5857f9bf3b7fb28a7ccc0bd4886fd9430bfee98 | |
| parent | 0502953715220c48a988caed4e1e834602f5cb50 (diff) | |
| parent | 325b1163048afefa1873b1767bc84d295d5200af (diff) | |
| download | platform_packages_providers_ContactsProvider-97ce1519dbede8ee1acda75fbe8195f9d69bfdff.tar.gz platform_packages_providers_ContactsProvider-97ce1519dbede8ee1acda75fbe8195f9d69bfdff.tar.bz2 platform_packages_providers_ContactsProvider-97ce1519dbede8ee1acda75fbe8195f9d69bfdff.zip | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/ContactsProvider" am: ac10f31631 am: c3dfb44d2c am: 325b116304
Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/1588390
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib1193ac2e841d5197006b03d012abb5c4b32523c
| -rw-r--r-- | Android.bp | 19 | ||||
| -rw-r--r-- | test_common/Android.bp | 11 | ||||
| -rw-r--r-- | tests/Android.bp | 11 | ||||
| -rw-r--r-- | tests2/Android.bp | 11 |
4 files changed, 52 insertions, 0 deletions
@@ -1,3 +1,22 @@ +package { + default_applicable_licenses: [ + "packages_providers_ContactsProvider_license", + ], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "packages_providers_ContactsProvider_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + android_app { name: "ContactsProvider", defaults: ["platform_app_defaults"], diff --git a/test_common/Android.bp b/test_common/Android.bp index b30e2e33..207b1db4 100644 --- a/test_common/Android.bp +++ b/test_common/Android.bp @@ -12,6 +12,17 @@ // 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 "packages_providers_ContactsProvider_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "packages_providers_ContactsProvider_license", + ], +} + java_library { name: "ContactsProviderTestUtils", srcs: ["src/**/*.java"], diff --git a/tests/Android.bp b/tests/Android.bp index b15ded47..6fc1d179 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -1,3 +1,14 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_providers_ContactsProvider_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "packages_providers_ContactsProvider_license", + ], +} + android_test { name: "ContactsProviderTests", static_libs: [ diff --git a/tests2/Android.bp b/tests2/Android.bp index 9a2351aa..3dcdebbc 100644 --- a/tests2/Android.bp +++ b/tests2/Android.bp @@ -14,6 +14,17 @@ // 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_providers_ContactsProvider_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "packages_providers_ContactsProvider_license", + ], +} + android_test { name: "ContactsProviderTests2", static_libs: [ |