diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-20 12:41:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-07-20 12:41:01 +0000 |
| commit | 4eab8f2f8714dbf7caf7ea29b742e9d24f3c4741 (patch) | |
| tree | ea4a58fc9fa46e030f950ad185862012b383c0fb | |
| parent | 2f76949e0d8c68c27b7a4c8d082facb4d52e5290 (diff) | |
| parent | 168b257a2daa570fb6d0b07454ea4002d939f4c4 (diff) | |
| download | atv-4eab8f2f8714dbf7caf7ea29b742e9d24f3c4741.tar.gz | |
Merge "Revert "[ATV emulator] Disable ethernet on Android TV."" into sc-dev
| -rw-r--r-- | products/atv_emulator_vendor.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/products/atv_emulator_vendor.mk b/products/atv_emulator_vendor.mk index 848bb28..4b12dd3 100644 --- a/products/atv_emulator_vendor.mk +++ b/products/atv_emulator_vendor.mk @@ -44,6 +44,7 @@ PRODUCT_COPY_FILES += \ device/generic/goldfish/data/etc/apns-conf.xml:$(TARGET_COPY_OUT_VENDOR)/etc/apns-conf.xml \ device/generic/goldfish/camera/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ + frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_tv.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_tv.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ |