From dba65101a613ff6f752e77eb19f39fd2294aadb2 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 24 Nov 2017 12:40:12 +0900 Subject: [PATCH] taimen: don't pull netutils-wrappers from vendor blobs. These should be compiled from source instead. Bug: 69718172 Test: Identical to ag/546442, tested on walleye Change-Id: I2b579a952d0374c5e34c5296f227f638d3630aea --- aosp_taimen.mk | 3 ++- self-extractors/extract-lists.txt | 1 - self-extractors/qcom/staging/device-partial.mk | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/aosp_taimen.mk b/aosp_taimen.mk index 5a202b8..75927d6 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -28,7 +28,8 @@ $(call inherit-product-if-exists, vendor/google_devices/taimen/proprietary/devic PRODUCT_PACKAGES += \ Dialer \ Launcher3 \ - WallpaperPicker + WallpaperPicker \ + netutils-wrapper-1.0 PRODUCT_COPY_FILES += \ device/google/taimen/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt index bfe61ff..a748669 100644 --- a/self-extractors/extract-lists.txt +++ b/self-extractors/extract-lists.txt @@ -5,7 +5,6 @@ ;; qcom) TO_EXTRACT="\ - system/bin/netutils-wrapper-1.0 \ system/etc/cne/Nexus/ATT/ATT_profiles.xml \ system/etc/cne/Nexus/ROW/ROW_profiles.xml \ system/etc/cne/Nexus/VZW/VZW_profiles.xml \ diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index ae2684f..fee0c8c 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -14,7 +14,6 @@ # blob(s) necessary for Taimen hardware PRODUCT_COPY_FILES := \ - vendor/qcom/taimen/proprietary/netutils-wrapper-1.0:system/bin/netutils-wrapper-1.0:qcom \ vendor/qcom/taimen/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \ vendor/qcom/taimen/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \ vendor/qcom/taimen/proprietary/VZW_profiles.xml:system/etc/cne/Nexus/VZW/VZW_profiles.xml:qcom \