Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59fbdf0b authored by Justin Yun's avatar Justin Yun
Browse files

Add .product suffix for the product variants 

Instead of adding .vendor suffix, add .product suffix to include
product variants.

Bug: 309511650
Test: atest com.android.gts.vndk.VndkDependencyTest#testVndkDependencyTestCase
Change-Id: I6d578be95c618c565347f0fdf660e82945ac77a3
parent c7bc5399

core/soong_cc_rust_prebuilt.mk

+14 −4
Original line number Diff line number Diff line
@@ -129,9 +129,14 @@ ifdef LOCAL_INSTALLED_MODULE 
  ifdef LOCAL_SHARED_LIBRARIES

    my_shared_libraries := $(LOCAL_SHARED_LIBRARIES)

    ifdef LOCAL_USE_VNDK

      ifdef LOCAL_USE_VNDK_PRODUCT

        my_shared_libraries := $(foreach l,$(my_shared_libraries),\

          $(if $(SPLIT_PRODUCT.SHARED_LIBRARIES.$(l)),$(l).product,$(l)))

      else

        my_shared_libraries := $(foreach l,$(my_shared_libraries),\

          $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))

      endif

    endif

    $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \

      $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_shared_libraries))

  endif
@@ -139,9 +144,14 @@ ifdef LOCAL_INSTALLED_MODULE 
    my_dylibs := $(LOCAL_DYLIB_LIBRARIES)

    # Treat these as shared library dependencies for installation purposes.

    ifdef LOCAL_USE_VNDK

      ifdef LOCAL_USE_VNDK_PRODUCT

        my_dylibs := $(foreach l,$(my_dylibs),\

          $(if $(SPLIT_PRODUCT.SHARED_LIBRARIES.$(l)),$(l).product,$(l)))

      else

        my_dylibs := $(foreach l,$(my_dylibs),\

          $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))

      endif

    endif

    $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \

      $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_dylibs))

  endif