aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuans2018-05-25 14:32:07 -0500
committerbohu2018-06-04 13:02:12 -0500
commit360eb865edad858f4246edf27d9af3a5b3014ede (patch)
treec1a7fdf97e1d15002947c930b37b85cb06f63d3b
parent63762bdf414f6266ff8c94a2920ab8e75ef4d9ac (diff)
downloadplatform-build-360eb865edad858f4246edf27d9af3a5b3014ede.tar.gz
platform-build-360eb865edad858f4246edf27d9af3a5b3014ede.tar.xz
platform-build-360eb865edad858f4246edf27d9af3a5b3014ede.zip
Clean up deprecated properties. Set sepolicy for vendor process
Bug: 79941736 Test: Manually Change-Id: Ia7ec0d90be1dbce402b8b6b52762c7384c0d5e1e
-rw-r--r--target/board/generic/device.mk4
-rw-r--r--target/board/generic/sepolicy/goldfish_setup.te3
-rw-r--r--target/board/generic/sepolicy/property.te1
-rw-r--r--target/board/generic/sepolicy/property_contexts2
-rw-r--r--target/board/generic_arm64/device.mk4
-rw-r--r--target/board/generic_x86/device.mk4
-rwxr-xr-xtarget/board/generic_x86_64/device.mk4
-rw-r--r--target/product/emulator.mk13
8 files changed, 18 insertions, 17 deletions
diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk
index 8c66fc990..82c6657f5 100644
--- a/target/board/generic/device.mk
+++ b/target/board/generic/device.mk
@@ -17,10 +17,6 @@
17# This is a build configuration for the product aspects that 17# This is a build configuration for the product aspects that
18# are specific to the emulator. 18# are specific to the emulator.
19 19
20PRODUCT_PROPERTY_OVERRIDES := \
21 ro.ril.hsxpa=1 \
22 ro.ril.gprsclass=10
23
24PRODUCT_COPY_FILES := \ 20PRODUCT_COPY_FILES := \
25 device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ 21 device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
26 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ 22 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
diff --git a/target/board/generic/sepolicy/goldfish_setup.te b/target/board/generic/sepolicy/goldfish_setup.te
index a99653ca7..3041436b3 100644
--- a/target/board/generic/sepolicy/goldfish_setup.te
+++ b/target/board/generic/sepolicy/goldfish_setup.te
@@ -25,10 +25,11 @@ allow goldfish_setup varrun_file:file { mounton getattr create read write open u
25allow goldfish_setup execns_exec:file rx_file_perms; 25allow goldfish_setup execns_exec:file rx_file_perms;
26allow goldfish_setup proc_net:file rw_file_perms; 26allow goldfish_setup proc_net:file rw_file_perms;
27allow goldfish_setup proc:file r_file_perms; 27allow goldfish_setup proc:file r_file_perms;
28set_prop(goldfish_setup, ctl_default_prop);
29allow goldfish_setup nsfs:file r_file_perms; 28allow goldfish_setup nsfs:file r_file_perms;
30allow goldfish_setup system_data_file:dir getattr; 29allow goldfish_setup system_data_file:dir getattr;
31allow goldfish_setup kernel:system module_request; 30allow goldfish_setup kernel:system module_request;
31set_prop(goldfish_setup, qemu_prop);
32get_prop(goldfish_setup, net_share_prop);
32# Allow goldfish_setup to run /system/bin/ip and /system/bin/iw 33# Allow goldfish_setup to run /system/bin/ip and /system/bin/iw
33allow goldfish_setup system_file:file execute_no_trans; 34allow goldfish_setup system_file:file execute_no_trans;
34# Allow goldfish_setup to run init.wifi.sh 35# Allow goldfish_setup to run init.wifi.sh
diff --git a/target/board/generic/sepolicy/property.te b/target/board/generic/sepolicy/property.te
index 8c7c892d7..3593a39dd 100644
--- a/target/board/generic/sepolicy/property.te
+++ b/target/board/generic/sepolicy/property.te
@@ -2,3 +2,4 @@ type qemu_prop, property_type;
2type qemu_cmdline, property_type; 2type qemu_cmdline, property_type;
3type radio_noril_prop, property_type; 3type radio_noril_prop, property_type;
4type net_eth0_prop, property_type; 4type net_eth0_prop, property_type;
5type net_share_prop, property_type;
diff --git a/target/board/generic/sepolicy/property_contexts b/target/board/generic/sepolicy/property_contexts
index c5a2bc179..f7a241cfb 100644
--- a/target/board/generic/sepolicy/property_contexts
+++ b/target/board/generic/sepolicy/property_contexts
@@ -1,6 +1,8 @@
1qemu. u:object_r:qemu_prop:s0 1qemu. u:object_r:qemu_prop:s0
2qemu.cmdline u:object_r:qemu_cmdline:s0 2qemu.cmdline u:object_r:qemu_cmdline:s0
3vendor.qemu u:object_r:qemu_prop:s0
3ro.emu. u:object_r:qemu_prop:s0 4ro.emu. u:object_r:qemu_prop:s0
4ro.emulator. u:object_r:qemu_prop:s0 5ro.emulator. u:object_r:qemu_prop:s0
5ro.radio.noril u:object_r:radio_noril_prop:s0 6ro.radio.noril u:object_r:radio_noril_prop:s0
6net.eth0. u:object_r:net_eth0_prop:s0 7net.eth0. u:object_r:net_eth0_prop:s0
8net.shared_net_ip u:object_r:net_share_prop:s0
diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk
index 050b90da5..c0fbdcda4 100644
--- a/target/board/generic_arm64/device.mk
+++ b/target/board/generic_arm64/device.mk
@@ -17,10 +17,6 @@
17# This is a build configuration for the product aspects that 17# This is a build configuration for the product aspects that
18# are specific to the emulator. 18# are specific to the emulator.
19 19
20PRODUCT_PROPERTY_OVERRIDES := \
21 ro.ril.hsxpa=1 \
22 ro.ril.gprsclass=10
23
24PRODUCT_COPY_FILES := \ 20PRODUCT_COPY_FILES := \
25 device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ 21 device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
26 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ 22 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk
index aaac689fa..ecf869735 100644
--- a/target/board/generic_x86/device.mk
+++ b/target/board/generic_x86/device.mk
@@ -17,10 +17,6 @@
17# This is a build configuration for the product aspects that 17# This is a build configuration for the product aspects that
18# are specific to the emulator. 18# are specific to the emulator.
19 19
20PRODUCT_PROPERTY_OVERRIDES := \
21 ro.ril.hsxpa=1 \
22 ro.ril.gprsclass=10
23
24PRODUCT_COPY_FILES := \ 20PRODUCT_COPY_FILES := \
25 device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ 21 device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \
26 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ 22 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk
index aaac689fa..ecf869735 100755
--- a/target/board/generic_x86_64/device.mk
+++ b/target/board/generic_x86_64/device.mk
@@ -17,10 +17,6 @@
17# This is a build configuration for the product aspects that 17# This is a build configuration for the product aspects that
18# are specific to the emulator. 18# are specific to the emulator.
19 19
20PRODUCT_PROPERTY_OVERRIDES := \
21 ro.ril.hsxpa=1 \
22 ro.ril.gprsclass=10
23
24PRODUCT_COPY_FILES := \ 20PRODUCT_COPY_FILES := \
25 device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ 21 device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \
26 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ 22 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 8d5dc097d..78d8e921a 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -177,3 +177,16 @@ PRODUCT_FULL_TREBLE_OVERRIDE := true
177#once it is fixed in aosp, remove this block of comment. 177#once it is fixed in aosp, remove this block of comment.
178#PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ 178#PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
179#config.disable_location=true 179#config.disable_location=true
180
181# Enable Perfetto traced
182PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
183 persist.traced.enable=1
184
185# enable Google-specific location features,
186# like NetworkLocationProvider and LocationCollector
187PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
188 ro.com.google.locationfeatures=1
189
190# disable setupwizard
191PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
192 ro.setupwizard.mode=DISABLED