summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-06-25 01:01:14 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-06-25 01:01:14 +0000
commit3a47ac77d70a8f6cd384d66ecabf7d0e6b421a15 (patch)
treea24f7c9e228be7e15cbdcd025abe6266ea8cb86e
parentef291395cd78242306c2a79d9014f6838396ecab (diff)
parent4780eb455bfa3d43a5e5439b004847fc1e576839 (diff)
Merge "Define prebuilt xml files as prebuilt_etc modules" into main
-rw-r--r--data/etc/Android.bp24
1 files changed, 24 insertions, 0 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 707b9982ab..b63d14b2cb 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -412,6 +412,14 @@ prebuilt_etc {
defaults: ["frameworks_native_data_etc_defaults"],
}
+// installed in system
+prebuilt_etc {
+ name: "android.software.preview_sdk.prebuilt.xml",
+ relative_install_path: "permissions",
+ src: "android.software.preview_sdk.xml",
+ filename_from_src: true,
+}
+
prebuilt_etc {
name: "android.software.sip.voip.prebuilt.xml",
src: "android.software.sip.voip.xml",
@@ -454,6 +462,22 @@ prebuilt_etc {
defaults: ["frameworks_native_data_etc_defaults"],
}
+// installed in system
+prebuilt_etc {
+ name: "android.software.webview.prebuilt.xml",
+ relative_install_path: "permissions",
+ src: "android.software.webview.xml",
+ filename_from_src: true,
+}
+
+// installed in system
+prebuilt_etc {
+ name: "android.software.window_magnification.prebuilt.xml",
+ relative_install_path: "permissions",
+ src: "android.software.window_magnification.xml",
+ filename_from_src: true,
+}
+
prebuilt_etc {
name: "aosp_excluded_hardware.prebuilt.xml",
src: "aosp_excluded_hardware.xml",