summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-10-05 03:06:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-05 03:06:52 +0000
commit98465ed0ea7364cde8917fc8c98e775154785d76 (patch)
treef0c467d0e422c3ba10baa11aa9ad2214d48daecc /data
parent15f0579ed24f7ffe1b0dbd4ee9f2242fcf910899 (diff)
parent9f3b4a57f643bf449b3fe4bb043145d2a547cf68 (diff)
downloadnative-98465ed0ea7364cde8917fc8c98e775154785d76.tar.gz
Merge "Add prebuilt_etc for consumerir feature xml" into main am: fe0c71f1e2 am: fe0739eaa2 am: 10656c4238 am: 9f3b4a57f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2752129 Change-Id: I49293b9ece735928f2e27ea06d58968ddfafd127 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'data')
-rw-r--r--data/etc/Android.bp6
1 files changed, 6 insertions, 0 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 4a54de1635..e95432c98f 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -83,6 +83,12 @@ prebuilt_etc {
}
prebuilt_etc {
+ name: "android.hardware.consumerir.prebuilt.xml",
+ src: "android.hardware.consumerir.xml",
+ defaults: ["frameworks_native_data_etc_defaults"],
+}
+
+prebuilt_etc {
name: "android.hardware.ethernet.prebuilt.xml",
src: "android.hardware.ethernet.xml",
defaults: ["frameworks_native_data_etc_defaults"],