aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-20 23:03:14 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-20 23:03:14 +0000
commit1c8624d942eba214e2411b28f1099f152226adab (patch)
tree541f39d4f728267eff6349cdb3351d8cd998f5e5
parentb3692ae5dbe4d4e79fecb724428db547fc71b270 (diff)
parentf55b2ffc2e6a6331b8b25a48bd0de764c89b7df4 (diff)
downloadgs-common-1c8624d942eba214e2411b28f1099f152226adab.tar.gz
Snap for 9981223 from f55b2ffc2e6a6331b8b25a48bd0de764c89b7df4 to udc-release
Change-Id: Ib5e0830f2ed9fa6e7f3080e184d5847c1edcf79d
-rw-r--r--device.mk3
-rw-r--r--pixel_ril/ril.mk6
-rw-r--r--pixel_ril/sepolicy/rild.te5
-rw-r--r--storage/sepolicy/fastbootd.te1
4 files changed, 14 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index 2813186..f686621 100644
--- a/device.mk
+++ b/device.mk
@@ -23,3 +23,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Installs gsi keys into ramdisk, to boot a developer GSI with verified boot.
$(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml
diff --git a/pixel_ril/ril.mk b/pixel_ril/ril.mk
index 03f7f24..37274aa 100644
--- a/pixel_ril/ril.mk
+++ b/pixel_ril/ril.mk
@@ -9,6 +9,10 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/pixel_ril/co
PRODUCT_PACKAGES += ril-extension
-PRODUCT_SOONG_NAMESPACES += vendor/google/tools/ril-extension-service
+PRODUCT_PACKAGES_DEBUG += libgooglerilmemmonitor
+
+PRODUCT_SOONG_NAMESPACES += \
+ vendor/google/tools/ril-extension-service \
+ vendor/google/tools/ril-mem-monitor
USE_GOOGLE_RIL_EXT := true
diff --git a/pixel_ril/sepolicy/rild.te b/pixel_ril/sepolicy/rild.te
index 3bb2cd7..55bffee 100644
--- a/pixel_ril/sepolicy/rild.te
+++ b/pixel_ril/sepolicy/rild.te
@@ -1,2 +1,7 @@
add_service(rild, hal_ril_ext_service)
binder_call(rild, rilextensionservice_app)
+
+# Allow rild to ptrace for memory leak detection
+userdebug_or_eng(`
+allow rild self:process ptrace;
+')
diff --git a/storage/sepolicy/fastbootd.te b/storage/sepolicy/fastbootd.te
new file mode 100644
index 0000000..35bac15
--- /dev/null
+++ b/storage/sepolicy/fastbootd.te
@@ -0,0 +1 @@
+allow fastbootd devpts:chr_file rw_file_perms;