Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" into pi-dev
This commit is contained in:
@@ -4,7 +4,8 @@ type goldfish_setup_exec, vendor_file_type, exec_type, file_type;
|
|||||||
|
|
||||||
init_daemon_domain(goldfish_setup)
|
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:capability { net_admin net_raw };
|
||||||
allow goldfish_setup self:udp_socket { create ioctl };
|
allow goldfish_setup self:udp_socket { create ioctl };
|
||||||
allow goldfish_setup vendor_toolbox_exec:file execute_no_trans;
|
allow goldfish_setup vendor_toolbox_exec:file execute_no_trans;
|
||||||
|
@@ -5,5 +5,6 @@ type qemu_props_exec, vendor_file_type, exec_type, file_type;
|
|||||||
init_daemon_domain(qemu_props)
|
init_daemon_domain(qemu_props)
|
||||||
|
|
||||||
set_prop(qemu_props, qemu_prop)
|
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)
|
set_prop(qemu_props, qemu_cmdline)
|
||||||
|
@@ -31,4 +31,7 @@ PRODUCT_PACKAGES += \
|
|||||||
|
|
||||||
include $(SRC_TARGET_DIR)/product/full.mk
|
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
|
PRODUCT_NAME := aosp_arm
|
||||||
|
@@ -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)
|
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
|
||||||
|
|
||||||
include $(SRC_TARGET_DIR)/product/emulator.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_NAME := aosp_arm64
|
||||||
PRODUCT_DEVICE := generic_arm64
|
PRODUCT_DEVICE := generic_arm64
|
||||||
PRODUCT_BRAND := Android
|
PRODUCT_BRAND := Android
|
||||||
|
@@ -32,4 +32,7 @@ PRODUCT_PACKAGES += \
|
|||||||
|
|
||||||
include $(SRC_TARGET_DIR)/product/full_x86.mk
|
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
|
PRODUCT_NAME := aosp_x86
|
||||||
|
@@ -45,6 +45,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
|
|||||||
|
|
||||||
include $(SRC_TARGET_DIR)/product/emulator.mk
|
include $(SRC_TARGET_DIR)/product/emulator.mk
|
||||||
|
|
||||||
|
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
|
||||||
|
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
|
||||||
|
|
||||||
ifdef NET_ETH0_STARTONBOOT
|
ifdef NET_ETH0_STARTONBOOT
|
||||||
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
|
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
|
||||||
endif
|
endif
|
||||||
|
Reference in New Issue
Block a user