summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHector Tellez <htellez@google.com>2020-06-29 22:05:18 +0000
committerHector Tellez <htellez@google.com>2020-06-29 22:05:18 +0000
commitb7853018edb49f1cbf649ceb3addc88e633154fc (patch)
treec4aca255c76f65e37f64226213be5273bcf01b51
parent229a73d35b95258d1412d6f8773a7f4175a322f6 (diff)
downloadsunfish-b7853018edb49f1cbf649ceb3addc88e633154fc.tar.gz
Revert "Add feature flag for FEATURE_IPSEC_TUNNELS"
Revert "sunfish: update kernel-and-modules prebuilt" Revert submission 11982278-b_157446224-rvc-dev Reason for revert: Broke presubmit tests. Bug: 145905081 Bug: 155590308 I850013c55:Add feature flag for FEATURE_IPSEC_TUNNELS I8f858e404:sunfish: update SHIPPING_API_LEVEL and VINTF targe... Icc515373a:sunfish: update kernel-and-modules prebuilt Change-Id: I97d8635fc43a7c2de5d929df088cf75ad779022e
-rw-r--r--device.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index 72390c82..f2d16015 100644
--- a/device.mk
+++ b/device.mk
@@ -247,7 +247,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
frameworks/native/data/etc/android.hardware.telephony.carrierlock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.carrierlock.xml \
frameworks/native/data/etc/android.hardware.strongbox_keystore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.strongbox_keystore.xml \
- frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \
frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \