Linktype check for native:product
Similar to native:vendor, native:product can use VNDK libs but not
vndk_private.
It is activated when PRODUCT_PRODUCT_VNDK_VERSION is set.
Bug: 146620523
Test: build with PRODUCT_PRODUCT_VNDK_VERSION := current
Change-Id: Icfd94dfc30e77581991799d9e2f408f57da22cea
diff --git a/core/local_vndk.mk b/core/local_vndk.mk
index 198e361..91b5eb4 100644
--- a/core/local_vndk.mk
+++ b/core/local_vndk.mk
@@ -1,9 +1,9 @@
-#Set LOCAL_USE_VNDK for modules going into vendor or odm partition, except for host modules
+#Set LOCAL_USE_VNDK for modules going into product, vendor or odm partition, except for host modules
#If LOCAL_SDK_VERSION is set, thats a more restrictive set, so they dont need LOCAL_USE_VNDK
ifndef LOCAL_IS_HOST_MODULE
ifndef LOCAL_SDK_VERSION
- ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))
+ ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE) $(LOCAL_PROPRIETARY_MODULE) $(LOCAL_PRODUCT_MODULE)))
LOCAL_USE_VNDK:=true
# Note: no need to check LOCAL_MODULE_PATH* since LOCAL_[VENDOR|ODM|OEM]_MODULE is already
# set correctly before this is included.
@@ -34,5 +34,11 @@
ifndef BOARD_VNDK_VERSION
LOCAL_USE_VNDK:=
endif
+
+ ifndef PRODUCT_PRODUCT_VNDK_VERSION
+ ifneq (,$(filter true,$(LOCAL_PRODUCT_MODULE)))
+ LOCAL_USE_VNDK :=
+ endif
+ endif
endif