Revert "Linktype check for native:product"
This reverts commit 4e7e76fe5a19996ad02f7260ef81c780b41f1a99.
Reason for revert: build breaks (bid: 6147225) and postsubmit test fails.
There are some modules that have both "product_specific: true" and "vendor_available: true", which tags the module as "native:product" unintentionally.
We need to clean up these cases first and revisit this CL.
Bug: 146620523
Bug: 147987741
Change-Id: Ib07543235d72a135b6b732aaa909c147d2df832b
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 9984533..6b80a15 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -800,28 +800,22 @@
my_required_modules += $(LOCAL_REQUIRED_MODULES_$($(my_prefix)OS))
endif
-##########################################################################
-## When compiling against the VNDK, add the .vendor or .product suffix to
-## required modules.
-##########################################################################
+###############################################################################
+## When compiling against the VNDK, add the .vendor suffix to required modules.
+###############################################################################
ifneq ($(LOCAL_USE_VNDK),)
- #####################################################
- ## Soong modules may be built three times, once for
- ## /system, once for /vendor and once for /product.
- ## If we're using the VNDK, switch all soong
- ## libraries over to the /vendor or /product variant.
- #####################################################
+ ####################################################
+ ## Soong modules may be built twice, once for /system
+ ## and once for /vendor. If we're using the VNDK,
+ ## switch all soong libraries over to the /vendor
+ ## variant.
+ ####################################################
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
# We don't do this renaming for soong-defined modules since they already
- # have correct names (with .vendor or .product suffix when necessary) in
- # their LOCAL_*_LIBRARIES.
- ifeq ($(LOCAL_PRODUCT_MODULE),true)
- my_required_modules := $(foreach l,$(my_required_modules),\
- $(if $(SPLIT_PRODUCT.SHARED_LIBRARIES.$(l)),$(l).product,$(l)))
- else
- my_required_modules := $(foreach l,$(my_required_modules),\
- $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))
- endif
+ # have correct names (with .vendor suffix when necessary) in their
+ # LOCAL_*_LIBRARIES.
+ my_required_modules := $(foreach l,$(my_required_modules),\
+ $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))
endif
endif