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

Commit 560cc849 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Define __ANDROID_VENDOR_API__ for product variants" into main am: af8eb077 

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



Change-Id: Iea3425545bcde3e5da1de8935f54e0a9b5994510
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95297cc3 af8eb077

core/binary.mk

+10 −8
Original line number Original line Diff line number Diff line
@@ -330,7 +330,13 @@ ifneq ($(call module-in-vendor-or-product),) 
  ifneq ($(LOCAL_IN_VENDOR),)

  ifneq ($(LOCAL_IN_VENDOR),)

    # Vendor modules have LOCAL_IN_VENDOR

    # Vendor modules have LOCAL_IN_VENDOR

    my_cflags += -D__ANDROID_VENDOR__

    my_cflags += -D__ANDROID_VENDOR__

  else ifneq ($(LOCAL_IN_PRODUCT),)

    # Product modules have LOCAL_IN_PRODUCT

    my_cflags += -D__ANDROID_PRODUCT__

  endif





  # Define __ANDROID_VENDOR_API__ for both product and vendor variants because

  # they both use the same LLNDK libraries.

  ifeq ($(BOARD_API_LEVEL),)

  ifeq ($(BOARD_API_LEVEL),)

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

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

    # This must be a build failure when UDC is no longer built from this source tree.
@@ -338,10 +344,6 @@ ifneq ($(call module-in-vendor-or-product),) 
  else

  else

    my_cflags += -D__ANDROID_VENDOR_API__=$(BOARD_API_LEVEL)

    my_cflags += -D__ANDROID_VENDOR_API__=$(BOARD_API_LEVEL)

  endif

  endif

  else ifneq ($(LOCAL_IN_PRODUCT),)

    # Product modules have LOCAL_IN_PRODUCT

    my_cflags += -D__ANDROID_PRODUCT__

  endif

endif

endif





ifndef LOCAL_IS_HOST_MODULE

ifndef LOCAL_IS_HOST_MODULE