summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-06-25 01:22:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-06-25 01:22:33 +0000
commitd2b130fbbbfcf737097f3197b908cbd108d9f03d (patch)
tree6db0e3c980d41922f9e3e17c78315ae77443ca42 /data
parentc8721a7dec45b3d209b3a3a2b7b9451cb4eecd6d (diff)
parent3a47ac77d70a8f6cd384d66ecabf7d0e6b421a15 (diff)
Merge "Define prebuilt xml files as prebuilt_etc modules" into main am: 3a47ac77d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3140724 Change-Id: I0f023d7f8b0d7338c4dcfd0dee30d045b3cda243 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'data')
-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 0300f8c195..766c7685f3 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -418,6 +418,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",
@@ -460,6 +468,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",