diff --git a/Android.mk b/Android.mk
index e6a9462e..40726555 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,6 +22,22 @@
 
 LOCAL_PATH := $(call my-dir)
 
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,ueventd.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,hals.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,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/gs101,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,p2p_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+
+$(eval $(call declare-1p-copy-files,device/google/gs101,audio_policy_configuration.xml))
+
 # if some modules are built directly from this directory (not subdirectories),
 # their rules should be written here.
 
diff --git a/device.mk b/device.mk
index 86f528fa..a12f3824 100644
--- a/device.mk
+++ b/device.mk
@@ -972,7 +972,7 @@ PRODUCT_PACKAGES += \
 	android.hardware.audio.effect@7.0-impl \
 	android.hardware.bluetooth.audio@2.1-impl \
 	android.hardware.soundtrigger@2.3-impl \
-	vendor.google.whitechapel.audio.audioext@2.0-impl
+	vendor.google.whitechapel.audio.audioext@3.0-impl
 
 #Audio HAL libraries
 PRODUCT_PACKAGES += \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 2ab14967..c4da7c13 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -144,7 +144,7 @@
     </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
-       <version>2.0</version>
+       <version>3.0</version>
        <interface>
            <name>IAudioExt</name>
            <instance>default</instance>
diff --git a/manifest.xml b/manifest.xml
index 909f7170..4af66363 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -154,7 +154,7 @@
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>
-       <version>2.0</version>
+       <version>3.0</version>
        <interface>
            <name>IAudioExt</name>
            <instance>default</instance>
diff --git a/manifest_64.xml b/manifest_64.xml
index 3623f2c6..8c19233b 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -155,7 +155,7 @@
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>
-       <version>2.0</version>
+       <version>3.0</version>
        <interface>
            <name>IAudioExt</name>
            <instance>default</instance>