summaryrefslogtreecommitdiff
path: root/artd
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2023-04-19 15:10:06 +0100
committer Martin Stjernholm <mast@google.com> 2023-04-25 13:50:06 +0000
commit4cdcab58b438a91c91cd5b09235c703251c6e328 (patch)
tree0066be26ce92d35f74a3d82f8aa5fa76ef8866d0 /artd
parent4a7f8fa51c494b2025277e200692891526172208 (diff)
Propagate useartservice setting from experiment flag to global flag.
Only propagate it if it turns off ART Service - if OEMs have disabled it with dalvik.vm.useartservice then we shouldn't enable it. Introduce a new art_boot binary to do it, which is only run at boot through a oneshot service. We cannot use setprop commands directly in the init script, because non-vendor APEXes are prohibited from using `on` actions (b/278862348). Test: boot -> Check that dalvik.vm.useartservice is not false adb root adb shell setprop persist.device_config.runtime_native_boot.useartservice false -> Check that dalvik.vm.useartservice is not false adb reboot -> Check that dalvik.vm.useartservice is false on udc-dev Test: Same as above, but with an unbundled ART module build installed on git_sc-release and git_tm-release. Test: boot -> Check that dalvik.vm.useartservice is unset adb root adb shell setprop persist.device_config.runtime_native_boot.useartservice true -> Check that dalvik.vm.useartservice is unset adb reboot -> Check that dalvik.vm.useartservice is unset on udc-dev with dalvik.vm.useartservice unset Bug: 272056722 Ignore-AOSP-First: Will cherry-pick to AOSP later Change-Id: Ifc552ed924818d7363aef822cd3060f7adfc92b6
Diffstat (limited to 'artd')
-rw-r--r--artd/Android.bp7
-rw-r--r--artd/artd.rc23
2 files changed, 0 insertions, 30 deletions
diff --git a/artd/Android.bp b/artd/Android.bp
index b4518c91d0..1288ebcf25 100644
--- a/artd/Android.bp
+++ b/artd/Android.bp
@@ -61,13 +61,6 @@ art_cc_binary {
],
}
-prebuilt_etc {
- name: "com.android.art.artd.init.rc",
- src: "artd.rc",
- filename: "init.rc",
- installable: false,
-}
-
art_cc_defaults {
name: "art_artd_tests_defaults",
defaults: ["artd_defaults"],
diff --git a/artd/artd.rc b/artd/artd.rc
deleted file mode 100644
index 5ddfcdc219..0000000000
--- a/artd/artd.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# A lazy service that is started and stopped dynamically as needed.
-service artd /apex/com.android.art/bin/artd
- interface aidl artd
- disabled # Prevents the service from automatically starting at boot.
- oneshot # Prevents the service from automatically restarting each time it is stopped.
- class core
- user artd
- group artd
- capabilities DAC_OVERRIDE DAC_READ_SEARCH FOWNER CHOWN