diff --git a/aosp/system/core/rootdir/init.rc b/aosp/system/core/rootdir/init.rc index b1ba87edfe503dcdc153556bc9e73ff7ac14c08f..5266191e31d361916c2315a64b8e71dc12680308 100644 --- a/aosp/system/core/rootdir/init.rc +++ b/aosp/system/core/rootdir/init.rc @@ -73,9 +73,15 @@ on early-init chmod 666 /dev/binder chmod 666 /dev/hwbinder chmod 666 /dev/vndbinder + chmod 666 /dev/va_sync + chmod 666 /dev/va0_ctl + chmod 666 /dev/va_video0 + chmod 666 /dev/vacc0 + chmod 666 /dev/dri/card0 chmod 666 /dev/dri/renderD128 chmod 660 /dev/uinput chmod 660 /dev/ppp + chown root graphics /dev/dri/card0 chown root graphics /dev/dri/renderD128 chown uhid uhid /dev/uinput chown radio vpn /dev/ppp @@ -765,13 +771,13 @@ on post-fs-data # To handle userspace reboots, make sure that apexd is started cleanly here # (set apexd.status="") and that it is restarted if it's already running. # - # /data/apex uses encryption=Require because direct I/O support is needed on + # /data/apex uses encryption=None because direct I/O support is needed on # APEX files, but some devices don't support direct I/O on encrypted files. # Also, APEXes are public information, similar to the system image. # /data/apex/decompressed and /data/apex/ota_reserved override this setting; # they are encrypted so that files in them can be hard-linked into # /data/rollback which is encrypted. - mkdir /data/apex 0755 root system encryption=Require + mkdir /data/apex 0755 root system encryption=None mkdir /data/apex/active 0755 root system mkdir /data/apex/backup 0700 root system mkdir /data/apex/decompressed 0755 root system encryption=Require @@ -870,9 +876,9 @@ on post-fs-data exec - virtualizationservice system -- /bin/rm -rf /data/misc/virtualizationservice mkdir /data/misc/virtualizationservice 0771 system system - # /data/preloads uses encryption=Require because it only contains preloaded + # /data/preloads uses encryption=None because it only contains preloaded # files that are public information, similar to the system image. - mkdir /data/preloads 0775 system system encryption=Require + mkdir /data/preloads 0775 system system encryption=None # For security reasons, /data/local/tmp should always be empty. # Do not place files or directories in /data/local/tmp @@ -918,7 +924,7 @@ on post-fs-data # filesystems expect this directory to exist; it's where the fsck tool puts # any recovered files that weren't present in any directory. It must be # unencrypted, as fsck must be able to write to it. - mkdir /data/lost+found 0770 root root encryption=Require + mkdir /data/lost+found 0770 root root encryption=None # create directory for DRM plug-ins - give drm the read/write access to # the following directory. @@ -950,7 +956,7 @@ on post-fs-data restorecon_recursive /data/system/shutdown-checkpoints # Create the parent directories of the user CE and DE storage directories. - # These parent directories must use encryption=Require, since each of their + # These parent directories must use encryption=None, since each of their # subdirectories uses a different encryption policy (a per-user one), and # encryption policies apply recursively. These directories should never # contain any subdirectories other than the per-user ones. /data/media/obb @@ -962,15 +968,15 @@ on post-fs-data # as root with CAP_DAC_OVERRIDE. This is also fully enforced via the # SELinux policy. But we also set the DAC file modes accordingly, to try to # minimize differences in behavior if SELinux is set to permissive mode. - mkdir /data/media 0550 media_rw media_rw encryption=Require - mkdir /data/misc_ce 0551 system misc encryption=Require - mkdir /data/misc_de 0551 system misc encryption=Require - mkdir /data/system_ce 0550 system system encryption=Require - mkdir /data/system_de 0550 system system encryption=Require - mkdir /data/user 0511 system system encryption=Require - mkdir /data/user_de 0511 system system encryption=Require - mkdir /data/vendor_ce 0551 root root encryption=Require - mkdir /data/vendor_de 0551 root root encryption=Require + mkdir /data/media 0550 media_rw media_rw encryption=None + mkdir /data/misc_ce 0551 system misc encryption=None + mkdir /data/misc_de 0551 system misc encryption=None + mkdir /data/system_ce 0550 system system encryption=None + mkdir /data/system_de 0550 system system encryption=None + mkdir /data/user 0511 system system encryption=None + mkdir /data/user_de 0511 system system encryption=None + mkdir /data/vendor_ce 0551 root root encryption=None + mkdir /data/vendor_de 0551 root root encryption=None # Set the casefold flag on /data/media. For upgrades, a restorecon can be # needed first to relabel the directory from media_rw_data_file. @@ -1379,4 +1385,4 @@ on property:persist.device_config.mglru_native.lru_gen_config=core_and_nonleaf_y on property:persist.device_config.mglru_native.lru_gen_config=all write /sys/kernel/mm/lru_gen/enabled 7 on property:sys.action.shutdown=1 - exec_background - root root -- /system/bin/am broadcast -a android.intent.action.ACTION_SHUTDOWN \ No newline at end of file + exec_background - root root -- /system/bin/am broadcast -a android.intent.action.ACTION_SHUTDOWN diff --git a/aosp/system/core/rootdir/init.usb.rc b/aosp/system/core/rootdir/init.usb.rc index cb186c5dd0659aac2d1d2aa7823cc62b195cb82a..999462664b506ff2fdfeee4b33f4ee57ea2ed9a1 100644 --- a/aosp/system/core/rootdir/init.usb.rc +++ b/aosp/system/core/rootdir/init.usb.rc @@ -9,7 +9,7 @@ on post-fs-data chown system system /sys/class/android_usb/android0/f_rndis/ethaddr chmod 0660 /sys/class/android_usb/android0/f_rndis/ethaddr mkdir /data/misc/adb 02750 system shell - mkdir /data/adb 0700 root root encryption=None + mkdir /data/adb 0700 root root encryption=Require start adbd # adbd is controlled via property triggers in init..usb.rc diff --git a/aosp/vendor/common/etc/init.kbox.rc b/aosp/vendor/common/etc/init.kbox.rc deleted file mode 100644 index a7aaa3f17a3617f4e7a58e5ae3bf5913fa21f3d5..0000000000000000000000000000000000000000 --- a/aosp/vendor/common/etc/init.kbox.rc +++ /dev/null @@ -1,33 +0,0 @@ - -on early-init - mount debugfs debugfs /sys/kernel/debug - exec -- /vendor/bin/gpu_config.sh - -on init - setprop vmi.sys.orientation 0 - -on boot - setprop ARGH ARGH - setprop ro.radio.use-ppp no - setprop ro.build.product generic - setprop ro.product.device generic - -# set up the GPU caching - setprop ro.hwui.text_small_cache_width 1024 - setprop ro.hwui.text_small_cache_height 1024 - setprop ro.hwui.text_large_cache_width 2048 - setprop ro.hwui.text_large_cache_height 1024 - setprop ro.hwui.gradient_cache_size 1 - setprop ro.hwui.texture_cache_size 72 - setprop ro.hwui.layer_cache_size 48 - setprop ro.hwui.drop_shadow_cache_size 6 - setprop ro.hwui.texture_cache_flushrate 0.4 - setprop ro.hwui.r_buffer_cache_size 8 - setprop ro.hwui.path_cache_size 32 - -# enable Google-specific location features, -# like NetworkLocationProvider and LocationCollector - setprop ro.com.google.locationfeatures 1 - -on fs - mount_all /fstab.kbox diff --git a/aosp/vendor/isula/copyfiles.mk b/aosp/vendor/isula/copyfiles.mk index e13a1f4332c552a9405db8a0315417140dc58fb5..e6d02cf999191d441574801441f781f8e8d49b52 100644 --- a/aosp/vendor/isula/copyfiles.mk +++ b/aosp/vendor/isula/copyfiles.mk @@ -10,6 +10,8 @@ PRODUCT_COPY_FILES += \ # hals PRODUCT_COPY_FILES += \ + device/generic/goldfish/audio/policy/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/generic/goldfish/audio/policy/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ @@ -37,54 +39,3 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.vulkan.deqp.level-latest.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ -# kbox(to be deleted) -PRODUCT_COPY_FILES += \ - vendor/common/etc/init.kbox.rc:root/init.kbox.rc \ - - -# goldfish(to be deleted) -PRODUCT_COPY_FILES += \ - device/generic/goldfish/audio/policy/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/generic/goldfish/audio/policy/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \ - device/generic/goldfish/camera/media/profiles.xml:system/etc/media_profiles.xml \ - device/generic/goldfish/camera/media/codecs.xml:system/etc/media_codecs.xml \ - device/generic/goldfish/data/empty_data_disk:data/empty_data_disk \ - device/generic/goldfish/data/etc/dtb.img:dtb.img \ - device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - device/generic/goldfish/data/etc/apns-conf.xml:data/misc/apns/apns-conf.xml \ - device/generic/goldfish/radio/RadioConfig/radioconfig.xml:data/misc/emulator/config/radioconfig.xml \ - device/generic/goldfish/data/etc/iccprofile_for_sim0.xml:data/misc/modem_simulator/iccprofile_for_sim0.xml \ - device/generic/goldfish/data/etc/numeric_operator.xml:data/misc/modem_simulator/etc/modem_simulator/files/numeric_operator.xml \ - device/generic/goldfish/data/etc/local.prop:data/local.prop \ - device/generic/goldfish/init.ranchu.adb.setup.sh:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/init.ranchu.adb.setup.sh \ - device/generic/goldfish/init.ranchu-core.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-core.sh \ - device/generic/goldfish/init.ranchu-net.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-net.sh \ - device/generic/goldfish/init.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.ranchu.rc \ - device/generic/goldfish/init.system_ext.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.system_ext.rc \ - device/generic/goldfish/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc \ - device/generic/goldfish/input/virtio_input_rotary.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_rotary.idc \ - device/generic/goldfish/input/qwerty2.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/qwerty2.idc \ - device/generic/goldfish/input/qwerty2.kcm:$(TARGET_COPY_OUT_VENDOR)/usr/keychars/qwerty2.kcm \ - device/generic/goldfish/input/qwerty2.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/qwerty2.kl \ - device/generic/goldfish/input/virtio_input_multi_touch_1.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_1.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_2.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_2.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_3.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_3.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_4.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_4.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_5.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_5.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_6.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_6.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_7.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_7.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_8.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_8.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_9.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_9.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_10.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_10.idc \ - device/generic/goldfish/input/virtio_input_multi_touch_11.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_11.idc \ - device/generic/goldfish/display_settings_app_compat.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display_settings_app_compat.xml \ - device/generic/goldfish/display_settings_freeform.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display_settings_freeform.xml \ - device/generic/goldfish/display_settings.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display_settings.xml \ - device/generic/goldfish/pixel_fold/device_state_configuration.xml:/data/misc/pixel_fold/devicestate/device_state_configuration.xml \ - device/generic/goldfish/pixel_fold/display_layout_configuration.xml:/data/misc/pixel_fold/displayconfig/display_layout_configuration.xml \ - device/generic/goldfish/pixel_fold/display_settings.xml:/data/misc/pixel_fold/display_settings.xml \ - device/generic/goldfish/data/etc/config.ini:config.ini \ - device/generic/goldfish/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \ - device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-goldfish.xml \ - device/google/cuttlefish/host/commands/modem_simulator/files/iccprofile_for_sim0_for_CtsCarrierApiTestCases.xml:data/misc/modem_simulator/iccprofile_for_carrierapitests.xml \ - diff --git a/aosp/vendor/isula/manifest.xml b/aosp/vendor/isula/manifest.xml index 6e59b96e6d0b3f8fdaa3989b50bb9f2602c486ba..eb057b11245d5ebf509926b28c93466eba124908 100644 --- a/aosp/vendor/isula/manifest.xml +++ b/aosp/vendor/isula/manifest.xml @@ -62,4 +62,13 @@ default + + android.hardware.soundtrigger + hwbinder + 2.3 + + ISoundTriggerHw + default + + diff --git a/aosp/vendor/isula/packages.mk b/aosp/vendor/isula/packages.mk index e530ef3afd7ae0ba572081b6675c3bc6f270a600..9076307037f6d54816ae3e5b1b827bd3391a7951 100644 --- a/aosp/vendor/isula/packages.mk +++ b/aosp/vendor/isula/packages.mk @@ -5,20 +5,13 @@ # hals PRODUCT_PACKAGES += \ - android.hardware.atrace@1.0-service \ android.hardware.audio.effect@7.0-impl \ android.hardware.audio.service \ android.hardware.audio@7.1-impl.ranchu \ - android.hardware.camera.provider@2.4-impl \ - android.hardware.camera.provider@2.4-service_64 \ - android.hardware.contexthub-service.example \ + android.hardware.bluetooth-service.default \ android.hardware.drm@1.4-service-lazy.clearkey \ android.hardware.drm-service-lazy.clearkey \ - android.hardware.dumpstate-service.example \ android.hardware.gatekeeper@1.0-service.software \ - android.hardware.gnss@1.0 \ - android.hardware.gnss@1.0-impl \ - android.hardware.gnss@1.0-service \ android.hardware.graphics.allocator@2.0-impl \ android.hardware.graphics.allocator@2.0-service \ android.hardware.graphics.composer@2.1-impl \ @@ -26,18 +19,22 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.mapper@2.0-impl-2.1 \ android.hardware.health.storage-service.default \ android.hardware.health-service.example \ - android.hardware.lights-service.example \ - android.hardware.power.stats-service.example \ - android.hardware.power-service.example \ - android.hardware.security.keymint-service \ - android.hardware.sensors@1.0 \ - android.hardware.sensors@1.0-impl \ - android.hardware.sensors@1.0-service \ - android.hardware.thermal@2.0-service.mock \ - android.hardware.usb-service.example \ - android.hardware.vibrator-service.example \ - android.hardware.wifi@1.0-service \ - android.hardware.wifi-service \ + android.hardware.soundtrigger@2.3-impl \ + com.android.hardware.authsecret \ + com.android.hardware.gnss \ + com.android.hardware.power \ + com.android.hardware.secure_element \ + com.android.hardware.sensors \ + com.android.hardware.tetheroffload \ + com.android.hardware.thermal \ + com.android.hardware.usb \ + com.android.hardware.vibrator \ + com.android.hardware.wifi \ + com.google.keymint.rust.trusty \ + com.google.gatekeeper \ + com.google.oemlock \ + com.google.confirmationui \ + com.google.light \ # apks @@ -93,7 +90,6 @@ PRODUCT_PACKAGES += \ libvaccrt \ libvmpp-enc \ libvmpp-dec \ - gpu_config.sh \ va_gfx.ini \ libdrm.vendor \ libdumpstateutil.vendor \ diff --git a/aosp/vendor/isula/properties.mk b/aosp/vendor/isula/properties.mk index d9f73a3be1ccdf02b33800262a5d950d2c30ddf6..4d9b8d89a93a5c3497ae8cd59d495daf9d532dae 100644 --- a/aosp/vendor/isula/properties.mk +++ b/aosp/vendor/isula/properties.mk @@ -39,7 +39,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.surface_flinger.use_color_management=false \ ro.zygote.disable_gl_preload=1 \ ro.zygote=zygote64 \ - va.encoder.input_type=1 \ wifi.direct.interface=p2p-dev-wlan0 \ wifi.interface=wlan0 \ ro.lmk.use_new_strategy=false \ @@ -61,8 +60,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ # display PRODUCT_PROPERTY_OVERRIDES += \ ro.hardware.fps=30 \ - ro.hardware.height=1080 \ - ro.hardware.width=1920 \ + ro.hardware.height=1920 \ + ro.hardware.width=1080 \ ro.sf.lcd_density=440 \ @@ -77,8 +76,3 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.product.brand=google \ ro.product.model=sayram \ -# goldfish(to be deleted) -PRODUCT_PROPERTY_OVERRIDES += \ - ro.hardware.power=ranchu \ - ro.soc.model=ranchu \ - diff --git a/aosp/vendor/isula/vagpu/Android.mk b/aosp/vendor/isula/vagpu/Android.mk index 75bcda92ab9b5eacabfa8aa126574f38ac125f9c..ce8eb12e8ea01ea5a055b3ad4f2b749e8c29793b 100644 --- a/aosp/vendor/isula/vagpu/Android.mk +++ b/aosp/vendor/isula/vagpu/Android.mk @@ -115,16 +115,6 @@ $(foreach lib, $(hw_libs), \ hw, \ 1))) -gpu_bins := \ -gpu_config.sh \ - -$(foreach bin, $(gpu_bins), \ - $(eval $(call install-va-bins, \ - $(bin), \ - vendor/bin/$(bin), \ - , \ - ,))) - um_libs := \ libVAegl \ libVAOCL \