commit 310db02501318c38c45b07140058cdffae8fd267
author LaMont Jones <lamontjones@google.com> Thu Aug 04 20:02:33 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 04 20:02:33 2022 +0000
tree 38c8795822342ecf8cd8ba98ee7e93d9a8d997bb
parent 7b088543895c8f343f37ba0690bfeea4a83b0f9e
parent b64eac997096ad55c5100884b01bb468769d8970

Merge "orchestrator: inner-tree path can be a list." am: ef1d2f06c6 am: d2655af162 am: 5e365c170e am: b64eac9970

Original change: https://android-review.googlesource.com/c/platform/build/+/2138856

Change-Id: I96e968f6f6beaf58ecfc69c6efe54c66802e179e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6e7df48..68fbb2b 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -121,6 +121,7 @@
     init_system \
     input \
     installd \
+    IntentResolver \
     ip \
     iptables \
     ip-up-vpn \

target/product/cfi-common.mk

diff --git a/target/product/cfi-common.mk b/target/product/cfi-common.mk
index 3aa2be7..11c01a2 100644
--- a/target/product/cfi-common.mk
+++ b/target/product/cfi-common.mk
@@ -26,8 +26,10 @@
     frameworks/av/services \
     frameworks/minikin \
     hardware/broadcom/wlan/bcmdhd/wpa_supplicant_8_lib \
+    hardware/synaptics/wlan/synadhd/wpa_supplicant_8_lib \
     hardware/interfaces/nfc \
-    hardware/qcom/wlan/qcwcn/wpa_supplicant_8_lib \
+    hardware/qcom/wlan/legacy/qcwcn/wpa_supplicant_8_lib \
+    hardware/qcom/wlan/wcn6740/qcwcn/wpa_supplicant_8_lib \
     hardware/interfaces/keymaster \
     hardware/interfaces/security \
     packages/modules/Bluetooth/system \