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

Commit af8eb077 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Define __ANDROID_VENDOR_API__ for product variants" into main

parents 9f71aa64 2c9d884f
Loading
Loading
Loading
Loading
+10 −8
Original line number Diff line number Diff line
@@ -330,7 +330,13 @@ ifneq ($(call module-in-vendor-or-product),)
  ifneq ($(LOCAL_IN_VENDOR),)
    # Vendor modules have LOCAL_IN_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),)
    # 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.
@@ -338,10 +344,6 @@ 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
    my_cflags += -D__ANDROID_PRODUCT__
  endif
endif

ifndef LOCAL_IS_HOST_MODULE