From e9b513a35a03a3b5aa0cb20b547c948f6312a5d0 Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Fri, 4 Oct 2019 13:43:51 +0800 Subject: [PATCH] Clean up mainline whitelist in aosp_product.mk Bug: 138281437 Bug: 140912362 Test: for prod in aosp_bonito aosp_arm64 aosp_cf_x86_phone ; do \ lunch ${prod}-userdebug \ m -j100 nothing || exit 1 \ done Change-Id: I2bc1f49ce68e49313e5c00104aad7b21a101ca7a --- target/product/aosp_product.mk | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk index 8c879831b2..aefad82898 100644 --- a/target/product/aosp_product.mk +++ b/target/product/aosp_product.mk @@ -21,21 +21,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk) # Default AOSP sounds $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) -# TODO(b/133643923): Clean up the mainline whitelist -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - system/app/messaging/messaging.apk \ - system/app/messaging/oat/% \ - system/app/WAPPushManager/WAPPushManager.apk \ - system/app/WAPPushManager/oat/% \ - system/bin/healthd \ - system/etc/init/healthd.rc \ - system/etc/vintf/manifest/manifest_healthd.xml \ - system/lib/libframesequence.so \ - system/lib/libgiftranscode.so \ - system/lib64/libframesequence.so \ - system/lib64/libgiftranscode.so \ - - # Additional settings used in all AOSP builds PRODUCT_PRODUCT_PROPERTIES += \ ro.config.ringtone=Ring_Synth_04.ogg \