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

Commit 5c40932a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Rename LOCAL_USE_VNDK"" into main am: 81c7511f 

Original change: https://android-review.googlesource.com/c/platform/build/+/2946128



Change-Id: I8aef8c9cfc738bda1c68d8e3b9f0dae8f6077356
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c4bf6cc 81c7511f

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,$(call module-in-vendor-or-product))

  ifeq (true,$(LOCAL_USE_VNDK))

    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_vendor_product.mk

include $(BUILD_SYSTEM)/local_vndk.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 ($(call module-in-vendor-or-product),)

ifneq ($(LOCAL_USE_VNDK),)

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

    apiimport_postfix := .apiimport

    ifeq ($(LOCAL_IN_PRODUCT),true)

    ifeq ($(LOCAL_USE_VNDK_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 ($(call module-in-vendor-or-product),)

ifneq ($(LOCAL_USE_VNDK),)

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

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

  ## /system, once for /vendor and once for /product.
@@ -1124,7 +1124,7 @@ ifneq ($(call module-in-vendor-or-product),) 
    # 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_IN_PRODUCT),true)

    ifeq ($(LOCAL_USE_VNDK_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 ($(call module-in-vendor-or-product),)

ifneq ($(LOCAL_USE_VNDK),)

  my_cflags += -D__ANDROID_VNDK__

  ifneq ($(LOCAL_IN_VENDOR),)

    # Vendor modules have LOCAL_IN_VENDOR

  ifneq ($(LOCAL_USE_VNDK_VENDOR),)

    # Vendor modules have LOCAL_USE_VNDK_VENDOR

    my_cflags += -D__ANDROID_VENDOR__



    ifeq ($(BOARD_API_LEVEL),)
@@ -345,8 +345,8 @@ ifneq ($(call module-in-vendor-or-product),) 
    else

      my_cflags += -D__ANDROID_VENDOR_API__=$(BOARD_API_LEVEL)

    endif

  else ifneq ($(LOCAL_IN_PRODUCT),)

    # Product modules have LOCAL_IN_PRODUCT

  else ifneq ($(LOCAL_USE_VNDK_PRODUCT),)

    # Product modules have LOCAL_USE_VNDK_PRODUCT

    my_cflags += -D__ANDROID_PRODUCT__

  endif

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


apiimport_postfix := .apiimport



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

  ifeq ($(LOCAL_IN_PRODUCT),true)

ifneq ($(LOCAL_USE_VNDK),)

  ifeq ($(LOCAL_USE_VNDK_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 ($(call module-in-vendor-or-product),)

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.

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

  ifeq ($(LOCAL_IN_PRODUCT),true)

  ifeq ($(LOCAL_USE_VNDK_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 ($(call module-in-vendor-or-product),)

ifeq ($(LOCAL_USE_VNDK),)

  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 ifeq ($(call module-in-vendor-or-product),true)

else ifdef LOCAL_USE_VNDK

    _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 ifeq ($(call module-in-vendor-or-product),true) 
        endif

        my_warn_types :=

        my_allowed_types := native:vndk native:vndk_private

    else ifeq ($(LOCAL_IN_PRODUCT),true)

    else ifeq ($(LOCAL_USE_VNDK_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



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

ifdef LOCAL_USE_VNDK

  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 :=



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

ifdef LOCAL_USE_VNDK

  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 ifeq ($(call module-in-vendor-or-product),true)

else ifdef LOCAL_USE_VNDK

    _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 ifeq ($(call module-in-vendor-or-product),true) 
            my_link_type := native:vndk_private

        endif

    else

        ifeq ($(LOCAL_IN_PRODUCT),true)

        ifeq ($(LOCAL_USE_VNDK_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



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

  ifeq ($(LOCAL_IN_PRODUCT),true)

ifneq ($(LOCAL_USE_VNDK),)

  ifeq ($(LOCAL_USE_VNDK_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

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

  ifeq ($(LOCAL_IN_PRODUCT),true)

ifdef LOCAL_USE_VNDK

  ifeq ($(LOCAL_USE_VNDK_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 −2
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ LOCAL_UNINSTALLABLE_MODULE:= 
LOCAL_UNSTRIPPED_PATH:=

LOCAL_USE_AAPT2:=

LOCAL_USE_CLANG_LLD:=

LOCAL_IN_VENDOR:=

LOCAL_IN_PRODUCT:=

LOCAL_USE_VNDK:=

LOCAL_USE_VNDK_PRODUCT:=

LOCAL_USES_LIBRARIES:=

LOCAL_VENDOR_MODULE:=

LOCAL_VINTF_FRAGMENTS:=