commit | 9b7a1cb56d9f5e41332530b4a4aae0abd06ac63b | [log] [tgz] |
---|---|---|
author | Daniel Norman <danielnorman@google.com> | Mon Oct 11 18:48:51 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 11 18:48:51 2021 +0000 |
tree | 2afb6e4bd3ef9ae13553aa92c9fcb5148583830e | |
parent | 441641ae461623df9016e7827e139c988a21b911 [diff] | |
parent | 98867eccea1e7666c75e731fb26e4d274199ad3d [diff] |
Merge "Creates an Android.bp prebuilt for the wifi passpoint feature XML." am: e484306d1b am: 55d5fa86da am: f22752ff1b am: 98867eccea Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1850659 Change-Id: I169ad5120523442cd5d9d75411714dbb72b05bc5
diff --git a/data/etc/Android.bp b/data/etc/Android.bp index 164fc5d..1e386b4 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp
@@ -185,6 +185,12 @@ } prebuilt_etc { + name: "android.hardware.wifi.passpoint.prebuilt.xml", + src: "android.hardware.wifi.passpoint.xml", + defaults: ["frameworks_native_data_etc_defaults"], +} + +prebuilt_etc { name: "android.software.device_id_attestation.prebuilt.xml", src: "android.software.device_id_attestation.xml", defaults: ["frameworks_native_data_etc_defaults"],