summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-07-09 15:09:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-07-09 15:09:35 +0000
commitcb539162241f67b0ab378af2a65eda50a5c595a9 (patch)
tree2116fb3c46861ef7fa3f1144cb7b6d104effce83
parent04ca8a7397e834df1f495a1987c7c4275cd07673 (diff)
parent5713f1b8ffc598c7fc5ff1bf869884ffee949539 (diff)
downloadatv-cb539162241f67b0ab378af2a65eda50a5c595a9.tar.gz
Merge "[ATV emulator] Disable ethernet on Android TV." into sc-dev
-rw-r--r--products/atv_emulator_vendor.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/products/atv_emulator_vendor.mk b/products/atv_emulator_vendor.mk
index 4b12dd3..848bb28 100644
--- a/products/atv_emulator_vendor.mk
+++ b/products/atv_emulator_vendor.mk
@@ -44,7 +44,6 @@ 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 \