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

Commit 722836c1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Define __ANDROID_VENDOR_API__" into main am: e4922b87 

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



Change-Id: I88ad1748ebc79a63933cf3ef9c5b88b6ca9ca5ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9047aa53 e4922b87

core/binary.mk

+10 −15
Original line number Diff line number Diff line
@@ -289,25 +289,20 @@ ifeq ($(NATIVE_COVERAGE),true) 
endif



ifneq ($(LOCAL_USE_VNDK),)

  # Required VNDK version for vendor modules is BOARD_VNDK_VERSION.

  my_api_level := $(BOARD_VNDK_VERSION)

  ifeq ($(my_api_level),current)

    # Build with current PLATFORM_VNDK_VERSION.

    # If PLATFORM_VNDK_VERSION has a CODENAME, it will return

    # __ANDROID_API_FUTURE__.

    my_api_level := $(call codename-or-sdk-to-sdk,$(PLATFORM_VNDK_VERSION))

  else

    # Build with current BOARD_VNDK_VERSION.

    my_api_level := $(call codename-or-sdk-to-sdk,$(BOARD_VNDK_VERSION))

  endif

  my_cflags += -D__ANDROID_VNDK__

  ifneq ($(LOCAL_USE_VNDK_VENDOR),)

    # Vendor modules have LOCAL_USE_VNDK_VENDOR when

    # BOARD_VNDK_VERSION is defined.

    # Vendor modules have LOCAL_USE_VNDK_VENDOR

    my_cflags += -D__ANDROID_VENDOR__



    ifeq ($(BOARD_API_LEVEL),)

      # TODO(b/314036847): This is a fallback for UDC targets.

      # This must be a build failure when UDC is no longer built from this source tree.

      my_cflags += -D__ANDROID_VENDOR_API__=$(PLATFORM_SDK_VERSION)

    else

      my_cflags += -D__ANDROID_VENDOR_API__=$(BOARD_API_LEVEL)

    endif

  else ifneq ($(LOCAL_USE_VNDK_PRODUCT),)

    # Product modules have LOCAL_USE_VNDK_PRODUCT when

    # PRODUCT_PRODUCT_VNDK_VERSION is defined.

    # Product modules have LOCAL_USE_VNDK_PRODUCT

    my_cflags += -D__ANDROID_PRODUCT__

  endif

endif

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ $(call add_json_bool, SamplingPGO, $(filter true,$(SAMPLIN 
$(call add_json_bool, ArtUseReadBarrier,                 $(call invert_bool,$(filter false,$(PRODUCT_ART_USE_READ_BARRIER))))

$(call add_json_str,  BtConfigIncludeDir,                $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR))

$(call add_json_list, DeviceKernelHeaders,               $(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) $(TARGET_PRODUCT_KERNEL_HEADERS))

$(call add_json_str,  VendorApiLevel,                    $(BOARD_API_LEVEL))

$(call add_json_str,  DeviceVndkVersion,                 $(BOARD_VNDK_VERSION))

$(call add_json_str,  Platform_vndk_version,             $(PLATFORM_VNDK_VERSION))

$(call add_json_list, ExtraVndkVersions,                 $(PRODUCT_EXTRA_VNDK_VERSIONS))