diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 18:44:06 +0100 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-16 18:44:06 +0100 |
| commit | 1055a2f07a92ae268ac95899e25cba7473de0f3b (patch) | |
| tree | 780fbca124716d20dd0ed8d89544cffafeead673 /updater | |
| parent | Merge "recovery: don't mount acct" (diff) | |
| parent | [LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery (diff) | |
| download | android_bootable_recovery-1055a2f07a92ae268ac95899e25cba7473de0f3b.tar android_bootable_recovery-1055a2f07a92ae268ac95899e25cba7473de0f3b.tar.gz android_bootable_recovery-1055a2f07a92ae268ac95899e25cba7473de0f3b.tar.bz2 android_bootable_recovery-1055a2f07a92ae268ac95899e25cba7473de0f3b.tar.lz android_bootable_recovery-1055a2f07a92ae268ac95899e25cba7473de0f3b.tar.xz android_bootable_recovery-1055a2f07a92ae268ac95899e25cba7473de0f3b.tar.zst android_bootable_recovery-1055a2f07a92ae268ac95899e25cba7473de0f3b.zip | |
Diffstat (limited to '')
| -rw-r--r-- | updater/Android.bp | 9 | ||||
| -rw-r--r-- | updater/Android.mk | 3 | ||||
| -rw-r--r-- | updater_sample/Android.bp | 9 | ||||
| -rw-r--r-- | updater_sample/tests/Android.bp | 9 |
4 files changed, 30 insertions, 0 deletions
diff --git a/updater/Android.bp b/updater/Android.bp index f00a192b9..840e50ab9 100644 --- a/updater/Android.bp +++ b/updater/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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_defaults { name: "libupdater_static_libs", diff --git a/updater/Android.mk b/updater/Android.mk index 46300d974..ddd4d864a 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -72,6 +72,9 @@ endef include $(CLEAR_VARS) LOCAL_MODULE := updater +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_SRC_FILES := \ updater_main.cpp diff --git a/updater_sample/Android.bp b/updater_sample/Android.bp index a014248b0..9222d0631 100644 --- a/updater_sample/Android.bp +++ b/updater_sample/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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + android_app { name: "SystemUpdaterSample", sdk_version: "system_current", diff --git a/updater_sample/tests/Android.bp b/updater_sample/tests/Android.bp index 806babd9e..4bdfe2cdf 100644 --- a/updater_sample/tests/Android.bp +++ b/updater_sample/tests/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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + android_test { name: "SystemUpdaterSampleTests", sdk_version: "system_current", |