Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f222b9e authored by Isaac Chen's avatar Isaac Chen Committed by Android (Google) Code Review
Browse files

Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" into pi-dev

parents 242a9e5f 075ee920

target/board/generic/sepolicy/goldfish_setup.te

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ type goldfish_setup_exec, vendor_file_type, exec_type, file_type; 


init_daemon_domain(goldfish_setup)



set_prop(goldfish_setup, debug_prop);

# TODO(b/79502552): Invalid property access from emulator vendor

#set_prop(goldfish_setup, debug_prop);

allow goldfish_setup self:capability { net_admin net_raw };

allow goldfish_setup self:udp_socket { create ioctl };

allow goldfish_setup vendor_toolbox_exec:file execute_no_trans;

target/board/generic/sepolicy/qemu_props.te

+2 −1
Original line number Diff line number Diff line
@@ -5,5 +5,6 @@ type qemu_props_exec, vendor_file_type, exec_type, file_type; 
init_daemon_domain(qemu_props)



set_prop(qemu_props, qemu_prop)

set_prop(qemu_props, dalvik_prop)

# TODO(b/79502552): Invalid property access from emulator vendor

#set_prop(qemu_props, qemu_cmdline)

set_prop(qemu_props, qemu_cmdline)

target/product/aosp_arm.mk

+3 −0
Original line number Diff line number Diff line
@@ -31,4 +31,7 @@ PRODUCT_PACKAGES += \ 


include $(SRC_TARGET_DIR)/product/full.mk



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true



PRODUCT_NAME := aosp_arm

target/product/aosp_arm64.mk

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) 
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)



include $(SRC_TARGET_DIR)/product/emulator.mk



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true



PRODUCT_NAME := aosp_arm64

PRODUCT_DEVICE := generic_arm64

PRODUCT_BRAND := Android

target/product/aosp_x86.mk

+3 −0
Original line number Diff line number Diff line
@@ -32,4 +32,7 @@ PRODUCT_PACKAGES += \ 


include $(SRC_TARGET_DIR)/product/full_x86.mk



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true



PRODUCT_NAME := aosp_x86