summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-04 04:21:27 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-04 04:21:27 +0000
commit17b23d5ec94a20e4f6cbe17a97799f8033a80b15 (patch)
tree0677af62cbd137969d7da37045b56d4951e13af8
parenta7ba98380a953d24ffb4ac917e0712384a946709 (diff)
parent600cce0ef3dc9eb4242d0b611c6c96a134d82ffc (diff)
downloadbonito-17b23d5ec94a20e4f6cbe17a97799f8033a80b15.tar.gz
Snap for 8253222 from 600cce0ef3dc9eb4242d0b611c6c96a134d82ffc to sdk-releaseplatform-tools-33.0.1
Change-Id: Idc31e3aa740e94bc37565da0126eac56c88cca4d
-rw-r--r--Android.mk16
-rw-r--r--METADATA2
-rw-r--r--product.prop2
3 files changed, 18 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 103485c6..46e75c8c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,22 @@
LOCAL_PATH := $(call my-dir)
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,ueventd.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,hals.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,media_profiles_V1_0.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,p2p_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/bonito,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+
+$(eval $(call declare-1p-copy-files,device/google/bonito,audio_policy_configuration.xml))
+
ifeq ($(USES_DEVICE_GOOGLE_B4S4),true)
subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
diff --git a/METADATA b/METADATA
index b454a1f8..39d28730 100644
--- a/METADATA
+++ b/METADATA
@@ -1,4 +1,4 @@
third_party {
- # would be NOTICE save for sdm710/original-kernel-headers/
+ license_note: "would be NOTICE save for sdm710/original-kernel-headers/"
license_type: RESTRICTED
}
diff --git a/product.prop b/product.prop
index ebea28b4..3c5a053f 100644
--- a/product.prop
+++ b/product.prop
@@ -90,4 +90,4 @@ persist.bluetooth.bqr.min_interval_ms=500
# Bluetooth operating voltage in millivolts
bluetooth.hardware.power.operating_voltage_mv=3300
# Hearing Aid Audio Support Using Bluetooth LE
-bluetooth.profile.asha.central=true
+bluetooth.profile.asha.central.enabled=true