From 542b61fa850a0ecc6862f077647f64e2a15a4a0c Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 6 Feb 2020 19:02:23 +0900 Subject: [PATCH 1/2] Move VNDK APEX to vendor partition ... for aosp_* targets so that we don't need to update vendor.img everytime there is a change in the VNDK libraries Bug: 140136207 Test: m Change-Id: Ifddaa3eb1623d3ec0a26c259790a43cdbb39424d (cherry picked from commit 8b22ee5fe950dec9b8e85d54f24965cfdd8154b0) --- aosp_walleye.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aosp_walleye.mk b/aosp_walleye.mk index 888c67d..7137bd9 100644 --- a/aosp_walleye.mk +++ b/aosp_walleye.mk @@ -35,6 +35,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_RESTRICT_VENDOR_FILES := owner +PRODUCT_PACKAGES += com.android.vndk.current.on_vendor + PRODUCT_MANUFACTURER := Google PRODUCT_BRAND := Android PRODUCT_NAME := aosp_walleye From 97c9000c1688f09f40c59ec4c3ff0d4862d5991b Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 27 Feb 2020 14:57:15 -0800 Subject: [PATCH 2/2] Update vendor blobs list for R BUG: 150403679 Merged-In: I281944e0965322a4a6c3095c099c39cdd8812c84 Change-Id: I281944e0965322a4a6c3095c099c39cdd8812c84 (cherry picked from commit e0055ed8e2ceefc9209a32a6b140c378574ba89d) --- self-extractors/extract-lists.txt | 1 - self-extractors/qcom/staging/device-partial.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt index b5c8272..e4d1ab3 100644 --- a/self-extractors/extract-lists.txt +++ b/self-extractors/extract-lists.txt @@ -18,7 +18,6 @@ system/framework/cneapiclient.jar \ system/framework/com.quicinc.cne.api-V1.0-java.jar \ system/framework/com.quicinc.cne.jar \ - system/framework/embmslibrary.jar \ system/framework/qcrilhook.jar \ system/framework/rcsimssettings.jar \ system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so \ diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index c56e8fe..9212206 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -28,7 +28,6 @@ PRODUCT_COPY_FILES := \ vendor/qcom/walleye/proprietary/cneapiclient.jar:system/framework/cneapiclient.jar:qcom \ vendor/qcom/walleye/proprietary/com.quicinc.cne.api-V1.0-java.jar:system/framework/com.quicinc.cne.api-V1.0-java.jar:qcom \ vendor/qcom/walleye/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \ - vendor/qcom/walleye/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \ vendor/qcom/walleye/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ vendor/qcom/walleye/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \ vendor/qcom/walleye/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \