summaryrefslogtreecommitdiff
path: root/radio
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-03-15 18:20:09 +0000
committerBob Badour <bbadour@google.com>2021-03-15 19:55:46 +0000
commit92ce444247ffa0028af82334c1e42fab5cffcae0 (patch)
tree5d434e23ead03160a4b741128bbaa03c75169115 /radio
parenta1e8e23b61f4371d07bba0cfb02f959d97727fbd (diff)
parent0c82fe16a1f5f956cc4906e55230fa8921644a52 (diff)
downloadpixel-92ce444247ffa0028af82334c1e42fab5cffcae0.tar.gz
DO NOT MERGE resolve merge conflicts of 0c82fe16a1f5f956cc4906e55230fa8921644a52 to sc-dev
Change-Id: Ia4cbb3e2b746c9c19a3084085c4f2c4fbc8297ca
Diffstat (limited to 'radio')
-rw-r--r--radio/Android.bp4
-rw-r--r--radio/gril_carrier_nv_headers/Android.bp6
2 files changed, 9 insertions, 1 deletions
diff --git a/radio/Android.bp b/radio/Android.bp
index f761ca4c..c0ac5e6e 100644
--- a/radio/Android.bp
+++ b/radio/Android.bp
@@ -1,4 +1,8 @@
// Define the soong config module for Pixel in this Android.bp
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
soong_config_module_type {
name: "pixel_glog_cc_defaults",
diff --git a/radio/gril_carrier_nv_headers/Android.bp b/radio/gril_carrier_nv_headers/Android.bp
index e671ad3b..845945ab 100644
--- a/radio/gril_carrier_nv_headers/Android.bp
+++ b/radio/gril_carrier_nv_headers/Android.bp
@@ -1,3 +1,7 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_library_headers {
name: "gril_carrier_nv_headers",
sanitize:{
@@ -7,4 +11,4 @@ cc_library_headers {
export_include_dirs: [
"inc/",
],
-} \ No newline at end of file
+}