diff options
| -rw-r--r-- | apex/com.google.cf.wifi/apex_manifest.json | 2 | ||||
| -rw-r--r-- | apex/com.google.cf.wifi/com.google.cf.wifi.rc | 12 | ||||
| -rw-r--r-- | guest/hals/vulkan/Android.bp | 1 | ||||
| -rw-r--r-- | guest/services/wifi/Android.bp | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/apex/com.google.cf.wifi/apex_manifest.json b/apex/com.google.cf.wifi/apex_manifest.json index ffd1a2c34..a13e719be 100644 --- a/apex/com.google.cf.wifi/apex_manifest.json +++ b/apex/com.google.cf.wifi/apex_manifest.json @@ -1,4 +1,4 @@ { - "name": "com.android.wifi.hal", + "name": "com.google.cf.wifi", "version": 1 } diff --git a/apex/com.google.cf.wifi/com.google.cf.wifi.rc b/apex/com.google.cf.wifi/com.google.cf.wifi.rc index c0fff55a3..11fbcf09f 100644 --- a/apex/com.google.cf.wifi/com.google.cf.wifi.rc +++ b/apex/com.google.cf.wifi/com.google.cf.wifi.rc @@ -1,23 +1,23 @@ -service rename_eth0 /apex/com.android.wifi.hal/bin/rename_netiface eth0 buried_eth0 +service rename_eth0 /apex/com.google.cf.wifi/bin/rename_netiface eth0 buried_eth0 user root oneshot # For legacy wifi without openwrt -service setup_wifi /apex/com.android.wifi.hal/bin/setup_wifi +service setup_wifi /apex/com.google.cf.wifi/bin/setup_wifi user root oneshot # For wifi with openwrt -service init_wifi_sh /apex/com.android.wifi.hal/bin/init.wifi +service init_wifi_sh /apex/com.google.cf.wifi/bin/init.wifi class late_start user root group root wakelock wifi oneshot disabled # Started on post-fs-data -service wpa_supplicant /apex/com.android.wifi.hal/bin/hw/wpa_supplicant \ +service wpa_supplicant /apex/com.google.cf.wifi/bin/hw/wpa_supplicant \ -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ - -m/apex/com.android.wifi.hal/etc/wifi/p2p_supplicant.conf \ + -m/apex/com.google.cf.wifi/etc/wifi/p2p_supplicant.conf \ -g@android:wpa_wlan0 -dd interface aidl android.hardware.wifi.supplicant.ISupplicant/default socket wpa_wlan0 dgram 660 wifi wifi @@ -26,7 +26,7 @@ service wpa_supplicant /apex/com.android.wifi.hal/bin/hw/wpa_supplicant \ disabled oneshot -service hostapd /apex/com.android.wifi.hal/bin/hw/hostapd_cf +service hostapd /apex/com.google.cf.wifi/bin/hw/hostapd_cf interface aidl android.hardware.wifi.hostapd.IHostapd/default class main capabilities NET_ADMIN NET_RAW diff --git a/guest/hals/vulkan/Android.bp b/guest/hals/vulkan/Android.bp index 6509dd128..9e7b110a7 100644 --- a/guest/hals/vulkan/Android.bp +++ b/guest/hals/vulkan/Android.bp @@ -60,6 +60,7 @@ apex { prebuilts: [ "com.google.cf.vulkan-linker-config", "android.hardware.vulkan.level-1.prebuilt.xml", + "android.hardware.vulkan.compute-0.prebuilt.xml", "android.hardware.vulkan.version-1_3.prebuilt.xml", "android.software.vulkan.deqp.level-latest.prebuilt.xml", "android.software.opengles.deqp.level-latest.prebuilt.xml", diff --git a/guest/services/wifi/Android.bp b/guest/services/wifi/Android.bp index 21c51ebd1..52d3e287c 100644 --- a/guest/services/wifi/Android.bp +++ b/guest/services/wifi/Android.bp @@ -20,7 +20,7 @@ genrule { name: "init.wifi_apex_srcs", srcs: ["init.wifi.sh"], out: ["init.wifi_apex.sh"], - cmd: "sed -E 's/\\/vendor\\/bin\\/mac802/\\/apex\\/com.android.wifi.hal\\/bin\\/mac802/' $(in) > $(out)", + cmd: "sed -E 's/\\/vendor\\/bin\\/mac802/\\/apex\\/com.google.cf.wifi\\/bin\\/mac802/' $(in) > $(out)", } sh_binary { |