From 3647a441ad52d4f5399fa2cbe161ca456bfaf724 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Mon, 26 Feb 2024 06:28:03 +0000 Subject: [PATCH 1/2] gps: Update gps makefile Test: on-device Bug: 326527903 Change-Id: I4357e7a7c5c35c9bdfd94fa8c1fd59d21bbcd668 --- gps/lsi/s5400.mk | 19 ------------------- gps/pixel/device_framework_matrix_product.xml | 10 ---------- gps/pixel/pixel_gnss_hal.mk | 15 --------------- 3 files changed, 44 deletions(-) delete mode 100644 gps/lsi/s5400.mk delete mode 100644 gps/pixel/device_framework_matrix_product.xml delete mode 100644 gps/pixel/pixel_gnss_hal.mk diff --git a/gps/lsi/s5400.mk b/gps/lsi/s5400.mk deleted file mode 100644 index 1bfc88e..0000000 --- a/gps/lsi/s5400.mk +++ /dev/null @@ -1,19 +0,0 @@ -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/lsi/sepolicy - -PRODUCT_SOONG_NAMESPACES += \ - vendor/samsung_slsi/gps/s5400 - -PRODUCT_PACKAGES += \ - android.hardware.location.gps.prebuilt.xml \ - gnssd \ - android.hardware.gnss-service \ - ca.pem \ - gnss_check.sh \ - kepler.bin - -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) - PRODUCT_VENDOR_PROPERTIES += vendor.gps.aol.enabled=true -endif - -# Enable Pixel GNSS HAL -include device/google/gs-common/gps/pixel/pixel_gnss_hal.mk \ No newline at end of file diff --git a/gps/pixel/device_framework_matrix_product.xml b/gps/pixel/device_framework_matrix_product.xml deleted file mode 100644 index 2c93444..0000000 --- a/gps/pixel/device_framework_matrix_product.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - android.hardware.gnss - 3 - - IGnss - vendor - - - diff --git a/gps/pixel/pixel_gnss_hal.mk b/gps/pixel/pixel_gnss_hal.mk deleted file mode 100644 index b0edff7..0000000 --- a/gps/pixel/pixel_gnss_hal.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Include this file to enable Pixel GNSS HAL - -$(call soong_config_set, pixel_gnss, enable_pixel_gnss_aidl_service, true) - -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/pixel/sepolicy - -PRODUCT_PACKAGES += \ - android.hardware.gnss-service.pixel - -PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.gps.hal.service.name=vendor - -# Compatibility matrix -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \ - device/google/gs-common/gps/pixel/device_framework_matrix_product.xml From f9c463189171207c18b8e71c2dbe848f1715f9cd Mon Sep 17 00:00:00 2001 From: Richard Hsu Date: Thu, 29 Feb 2024 17:24:29 -0800 Subject: [PATCH 2/2] [mlock] Allow edgetpu_app_service to call mlock() This CL references keunyoung's ag/25999220 This is to support the GenAI effort, allowing file backed large models to be mlocked, satisfying the memory accounting on Android. AVC error message: https://paste.googleplex.com/5844645780652032 Bug: 322229786 Tested: end-to-end on ZUM and ZPR. Change-Id: I6abef85eebbc051cb5e41b8f11f70f7ae1b489ab --- edgetpu/sepolicy/edgetpu_app_service.te | 9 +++++++++ edgetpu/sepolicy/file_contexts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/edgetpu/sepolicy/edgetpu_app_service.te b/edgetpu/sepolicy/edgetpu_app_service.te index 271805e..838f476 100644 --- a/edgetpu/sepolicy/edgetpu_app_service.te +++ b/edgetpu/sepolicy/edgetpu_app_service.te @@ -38,3 +38,12 @@ binder_call(edgetpu_app_server, edgetpu_vendor_server); # Allow EdgeTPU service to log to stats service. (metrics) allow edgetpu_app_server fwk_stats_service:service_manager find; + +# Allow mlock without size restriction +allow edgetpu_app_server self:capability ipc_lock; + +# Need to effectively read file mapped file when mmap + mlocked. +allow edgetpu_app_server privapp_data_file:file { map read}; + +# For shell level testing of mlock +allow edgetpu_app_server shell_data_file:file { map read}; diff --git a/edgetpu/sepolicy/file_contexts b/edgetpu/sepolicy/file_contexts index 0cada88..06f0a89 100644 --- a/edgetpu/sepolicy/file_contexts +++ b/edgetpu/sepolicy/file_contexts @@ -15,7 +15,7 @@ /vendor/lib64/libmetrics_logger\.so u:object_r:same_process_hal_file:s0 /vendor/lib64/libedgetpu_util\.so u:object_r:same_process_hal_file:s0 # EdgeTPU runtime libraries -/vendor/lib64/com\.google\.edgetpu_app_service-V[1-3]-ndk\.so u:object_r:same_process_hal_file:s0 +/vendor/lib64/com\.google\.edgetpu_app_service-V[1-4]-ndk\.so u:object_r:same_process_hal_file:s0 /vendor/lib64/com\.google\.edgetpu_vendor_service-V[1-2]-ndk\.so u:object_r:same_process_hal_file:s0 # EdgeTPU data files