From d0512cf386b2ac6073ab26e1dba22c0b41571052 Mon Sep 17 00:00:00 2001 From: bohu Date: Sat, 26 Oct 2019 23:34:45 -0700 Subject: [PATCH] emulator: remove vintf and some whitelists merge internal first to resolve conflicts from aosp BUG: 123495142 Change-Id: Ie204f22de49f0593a067f8cb52d3dea371fd2e13 Merged-In: Ie204f22de49f0593a067f8cb52d3dea371fd2e13 --- target/product/emulator.mk | 2 -- target/product/emulator_vendor.mk | 15 --------------- 2 files changed, 17 deletions(-) diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 7ff01cd9f8..52fa1a7c91 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -20,8 +20,6 @@ # Device modules PRODUCT_PACKAGES += \ - libGLES_android \ - vintf \ CarrierConfig \ # need this for gles libraries to load properly diff --git a/target/product/emulator_vendor.mk b/target/product/emulator_vendor.mk index e67124eb43..7891a2697e 100644 --- a/target/product/emulator_vendor.mk +++ b/target/product/emulator_vendor.mk @@ -21,21 +21,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) -# TODO(b/123495142): these files should be clean up -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := \ - system/bin/vintf \ - system/etc/permissions/android.software.verified_boot.xml \ - system/etc/permissions/privapp-permissions-goldfish.xml \ - system/lib/egl/libGLES_android.so \ - system/lib64/egl/libGLES_android.so \ - system/priv-app/SdkSetup/SdkSetup.apk \ - system/priv-app/SdkSetup/oat/% \ - -# Device modules -PRODUCT_PACKAGES += \ - libGLES_android \ - vintf \ - # need this for gles libraries to load properly # after moving to /vendor/lib/ PRODUCT_PACKAGES += \