From 3cb19a74f26afca1813824339d9fab5787b1b858 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Mon, 28 Oct 2019 05:07:46 +0000 Subject: [PATCH] Revert "Revert "Revert "Use com.android.vndk.current variant for vndk list""" This reverts commit 74f23d7ae689849bb8d109e36647ea7167f25d16. Reason for revert: b/143374795 Change-Id: I35cb387b87d3eb2eb0963b669e359ff538c28c90 --- rootdir/Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 52417305f..e1bb02fc6 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -326,7 +326,7 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_SAMEPROCESS_LIBRARIES),.com.android.vndk.current) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_SAMEPROCESS_LIBRARIES),.vendor) $(LOCAL_BUILT_MODULE): @echo "Generate: $@" @mkdir -p $(dir $@) @@ -342,7 +342,7 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_CORE_LIBRARIES),.com.android.vndk.current) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_CORE_LIBRARIES),.vendor) $(LOCAL_BUILT_MODULE): @echo "Generate: $@" @mkdir -p $(dir $@) @@ -358,7 +358,7 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_PRIVATE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_PRIVATE_LIBRARIES),.com.android.vndk.current) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_PRIVATE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_PRIVATE_LIBRARIES),.vendor) $(LOCAL_BUILT_MODULE): @echo "Generate: $@" @mkdir -p $(dir $@)