aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-05 21:46:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-05 21:46:10 +0000
commit2606a9702689543b7aa8175128ab95ae99bb4e49 (patch)
tree868282331ac5f78edf5f8e6621f41c5795b459e6
parent559fb5ba33c4288d79545c7abdd6d7368c0a1ce0 (diff)
parent94623fb37256d5735016cdddd69189cc626ad7b4 (diff)
downloadnvram-2606a9702689543b7aa8175128ab95ae99bb4e49.tar.gz
[LSC] Add LOCAL_LICENSE_KINDS to system/nvram am: abe4fdd77e am: 60009096d7 am: 94623fb372android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/system/nvram/+/1576277 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc909dd6f90d7f01b1ad18843f64855b6df0cc16
-rw-r--r--Android.bp4
-rw-r--r--client/Android.bp4
-rw-r--r--core/Android.bp4
-rw-r--r--core/tests/Android.bp4
-rw-r--r--hal/Android.bp4
-rw-r--r--hal/tests/Android.bp4
-rw-r--r--messages/Android.bp5
-rw-r--r--messages/tests/Android.bp4
8 files changed, 32 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 3d15039..57cf658 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,7 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
subdirs = [
"client",
"core",
diff --git a/client/Android.bp b/client/Android.bp
index c430efe..e114787 100644
--- a/client/Android.bp
+++ b/client/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_binary {
name: "nvram-client",
srcs: ["nvram_client.c"],
diff --git a/core/Android.bp b/core/Android.bp
index bf6d343..29c2505 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
subdirs = [
"tests",
]
diff --git a/core/tests/Android.bp b/core/tests/Android.bp
index d31ffe7..cc1d3d1 100644
--- a/core/tests/Android.bp
+++ b/core/tests/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_test_host {
name: "libnvram-core-tests",
srcs: [
diff --git a/hal/Android.bp b/hal/Android.bp
index 4f47024..0a69943 100644
--- a/hal/Android.bp
+++ b/hal/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
subdirs = [
"tests",
]
diff --git a/hal/tests/Android.bp b/hal/tests/Android.bp
index 28d9adf..79b67fd 100644
--- a/hal/tests/Android.bp
+++ b/hal/tests/Android.bp
@@ -14,6 +14,10 @@
// nvram_hal_test
// ========================================================
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_test {
name: "nvram_hal_test",
diff --git a/messages/Android.bp b/messages/Android.bp
index 88aa842..49e787f 100644
--- a/messages/Android.bp
+++ b/messages/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
subdirs = [
"tests",
]
@@ -36,4 +40,3 @@ cc_library_shared {
export_include_dirs: ["include"],
static_libs: ["libbase"],
}
-
diff --git a/messages/tests/Android.bp b/messages/tests/Android.bp
index a65300f..6ada96c 100644
--- a/messages/tests/Android.bp
+++ b/messages/tests/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_test_host {
name: "libnvram-messages-tests",
srcs: [