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

Commit 454265c2 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Reapply "Rename LOCAL_USE_VNDK" 

LOCAL_USE_VNDK property refers if the module uses VNDK, and this
property is being used to check if the module is installed in vendor or
product. However, the term no longer makes sense with VNDK deprecation,
so it should be renamed. Similar to change in aosp/2897612, rename
LOCAL_USE_VNDK as LOCAL_IN_VENDOR or LOCAL_IN_PRODUCT.

Bug: 316829758
Test: AOSP CF build succeeded
Change-Id: I2da2e2027ccabbcfbb444abc6828addeb3b22e13
parent 62bc1b46

core/autogen_test_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ifeq (true,$(is_native)) 
  ifeq (true,$(LOCAL_VENDOR_MODULE))

    autogen_test_install_base = /data/local/tests/vendor

  endif

  ifeq (true,$(LOCAL_USE_VNDK))

  ifeq (true,$(call module-in-vendor-or-product))

    autogen_test_install_base = /data/local/tests/vendor

  endif

endif

core/base_rules.mk

+5 −5
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ non_system_module := $(filter true, \ 
   $(LOCAL_VENDOR_MODULE) \

   $(LOCAL_PROPRIETARY_MODULE))



include $(BUILD_SYSTEM)/local_vndk.mk

include $(BUILD_SYSTEM)/local_vendor_product.mk



# local_current_sdk needs to run before local_systemsdk because the former may override

# LOCAL_SDK_VERSION which is used by the latter.
@@ -1095,10 +1095,10 @@ endif 
## When compiling against API imported module, use API import stub

## libraries.

##########################################################################

ifneq ($(LOCAL_USE_VNDK),)

ifneq ($(call module-in-vendor-or-product),)

  ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

    apiimport_postfix := .apiimport

    ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)

    ifeq ($(LOCAL_IN_PRODUCT),true)

      apiimport_postfix := .apiimport.product

    else

      apiimport_postfix := .apiimport.vendor
@@ -1113,7 +1113,7 @@ endif 
## When compiling against the VNDK, add the .vendor or .product suffix to

## required modules.

##########################################################################

ifneq ($(LOCAL_USE_VNDK),)

ifneq ($(call module-in-vendor-or-product),)

  #####################################################

  ## Soong modules may be built three times, once for

  ## /system, once for /vendor and once for /product.
@@ -1124,7 +1124,7 @@ ifneq ($(LOCAL_USE_VNDK),) 
    # 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_USE_VNDK_PRODUCT),true)

    ifeq ($(LOCAL_IN_PRODUCT),true)

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

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

    else

core/binary.mk

+14 −14
Original line number Diff line number Diff line
@@ -332,10 +332,10 @@ ifeq ($(CLANG_COVERAGE),true) 
  endif

endif



ifneq ($(LOCAL_USE_VNDK),)

ifneq ($(call module-in-vendor-or-product),)

  my_cflags += -D__ANDROID_VNDK__

  ifneq ($(LOCAL_USE_VNDK_VENDOR),)

    # Vendor modules have LOCAL_USE_VNDK_VENDOR

  ifneq ($(LOCAL_IN_VENDOR),)

    # Vendor modules have LOCAL_IN_VENDOR

    my_cflags += -D__ANDROID_VENDOR__



    ifeq ($(BOARD_API_LEVEL),)
@@ -345,8 +345,8 @@ ifneq ($(LOCAL_USE_VNDK),) 
    else

      my_cflags += -D__ANDROID_VENDOR_API__=$(BOARD_API_LEVEL)

    endif

  else ifneq ($(LOCAL_USE_VNDK_PRODUCT),)

    # Product modules have LOCAL_USE_VNDK_PRODUCT

  else ifneq ($(LOCAL_IN_PRODUCT),)

    # Product modules have LOCAL_IN_PRODUCT

    my_cflags += -D__ANDROID_PRODUCT__

  endif

endif
@@ -1174,8 +1174,8 @@ endif 


apiimport_postfix := .apiimport



ifneq ($(LOCAL_USE_VNDK),)

  ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)

ifneq ($(call module-in-vendor-or-product),)

  ifeq ($(LOCAL_IN_PRODUCT),true)

    apiimport_postfix := .apiimport.product

  else

    apiimport_postfix := .apiimport.vendor
@@ -1192,14 +1192,14 @@ my_header_libraries := $(foreach l,$(my_header_libraries), \ 
###########################################################

## When compiling against the VNDK, use LL-NDK libraries

###########################################################

ifneq ($(LOCAL_USE_VNDK),)

ifneq ($(call module-in-vendor-or-product),)

  #####################################################

  ## 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.

  #####################################################

  ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)

  ifeq ($(LOCAL_IN_PRODUCT),true)

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

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

    my_static_libraries := $(foreach l,$(my_static_libraries),\
@@ -1226,7 +1226,7 @@ endif 


# Platform can use vendor public libraries. If a required shared lib is one of

# the vendor public libraries, the lib is switched to the stub version of the lib.

ifeq ($(LOCAL_USE_VNDK),)

ifeq ($(call module-in-vendor-or-product),)

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

    $(if $(filter $(l),$(VENDOR_PUBLIC_LIBRARIES)),$(l).vendorpublic,$(l)))

endif
@@ -1278,7 +1278,7 @@ ifdef LOCAL_SDK_VERSION 
my_link_type := native:ndk:$(my_ndk_stl_family):$(my_ndk_stl_link_type)

my_warn_types := $(my_warn_ndk_types)

my_allowed_types := $(my_allowed_ndk_types)

else ifdef LOCAL_USE_VNDK

else ifeq ($(call module-in-vendor-or-product),true)

    _name := $(patsubst %.vendor,%,$(LOCAL_MODULE))

    _name := $(patsubst %.product,%,$(LOCAL_MODULE))

    ifneq ($(filter $(_name),$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES) $(LLNDK_LIBRARIES)),)
@@ -1289,7 +1289,7 @@ else ifdef LOCAL_USE_VNDK 
        endif

        my_warn_types :=

        my_allowed_types := native:vndk native:vndk_private

    else ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)

    else ifeq ($(LOCAL_IN_PRODUCT),true)

        # Modules installed to /product cannot directly depend on modules marked

        # with vendor_available: false

        my_link_type := native:product
@@ -1592,7 +1592,7 @@ my_ldlibs += $(my_cxx_ldlibs) 
###########################################################

ifndef LOCAL_IS_HOST_MODULE



ifdef LOCAL_USE_VNDK

ifeq ($(call module-in-vendor-or-product),true)

  my_target_global_c_includes :=

  my_target_global_c_system_includes := $(TARGET_OUT_HEADERS)

else ifdef LOCAL_SDK_VERSION
@@ -1686,7 +1686,7 @@ endif 
####################################################

imported_includes :=



ifdef LOCAL_USE_VNDK

ifeq (true,$(call module-in-vendor-or-product))

  imported_includes += $(call intermediates-dir-for,HEADER_LIBRARIES,device_kernel_headers,$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))

else

  # everything else should manually specify headers

core/cc_prebuilt_internal.mk

+6 −6
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ include $(BUILD_SYSTEM)/allowed_ndk_types.mk 


ifdef LOCAL_SDK_VERSION

my_link_type := native:ndk:$(my_ndk_stl_family):$(my_ndk_stl_link_type)

else ifdef LOCAL_USE_VNDK

else ifeq ($(call module-in-vendor-or-product),true)

    _name := $(patsubst %.vendor,%,$(LOCAL_MODULE))

    _name := $(patsubst %.product,%,$(LOCAL_MODULE))

    ifneq ($(filter $(_name),$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES) $(LLNDK_LIBRARIES)),)
@@ -90,7 +90,7 @@ else ifdef LOCAL_USE_VNDK 
            my_link_type := native:vndk_private

        endif

    else

        ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)

        ifeq ($(LOCAL_IN_PRODUCT),true)

            my_link_type := native:product

        else

            my_link_type := native:vendor
@@ -139,8 +139,8 @@ include $(BUILD_SYSTEM)/cxx_stl_setup.mk 
# When compiling against API imported module, use API import stub libraries.

apiimport_postfix := .apiimport



ifneq ($(LOCAL_USE_VNDK),)

  ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)

ifeq ($(call module-in-vendor-or-product),true)

  ifeq ($(LOCAL_IN_PRODUCT),true)

    apiimport_postfix := .apiimport.product

  else

    apiimport_postfix := .apiimport.vendor
@@ -158,8 +158,8 @@ my_system_shared_libraries := $(foreach l,$(my_system_shared_libraries), \ 
endif #my_system_shared_libraries



ifdef my_shared_libraries

ifdef LOCAL_USE_VNDK

  ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)

ifeq ($(call module-in-vendor-or-product),true)

  ifeq ($(LOCAL_IN_PRODUCT),true)

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

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

  else

core/clear_vars.mk

+2 −1
Original line number Diff line number Diff line
@@ -304,7 +304,8 @@ LOCAL_UNSTRIPPED_PATH:= 
LOCAL_USE_AAPT2:=

LOCAL_USE_CLANG_LLD:=

LOCAL_USE_VNDK:=

LOCAL_USE_VNDK_PRODUCT:=

LOCAL_IN_VENDOR:=

LOCAL_IN_PRODUCT:=

LOCAL_USES_LIBRARIES:=

LOCAL_VENDOR_MODULE:=

LOCAL_VINTF_FRAGMENTS:=