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

Commit 25dc5ea0 authored by Justin Yun's avatar Justin Yun Committed by Gerrit Code Review
Browse files

Merge "Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__"

parents c63bf0ad 69f7191d

core/binary.mk

+9 −0
Original line number Original line Diff line number Diff line
@@ -311,6 +311,15 @@ ifneq ($(LOCAL_USE_VNDK),) 
    my_api_level := $(call codename-or-sdk-to-sdk,$(BOARD_VNDK_VERSION))

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

  endif

  endif

  my_cflags += -D__ANDROID_VNDK__

  my_cflags += -D__ANDROID_VNDK__

  ifneq ($(LOCAL_USE_VNDK_VENDOR),)

    # Vendor modules have LOCAL_USE_VNDK_VENDOR when

    # BOARD_VNDK_VERSION is defined.

    my_cflags += -D__ANDROID_VENDOR__

  else ifneq ($(LOCAL_USE_VNDK_PRODUCT),)

    # Product modules have LOCAL_USE_VNDK_PRODUCT when

    # PRODUCT_PRODUCT_VNDK_VERSION is defined.

    my_cflags += -D__ANDROID_PRODUCT__

  endif

endif

endif





ifndef LOCAL_IS_HOST_MODULE

ifndef LOCAL_IS_HOST_MODULE

core/local_vndk.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ ifndef LOCAL_IS_HOST_MODULE 
ifndef LOCAL_SDK_VERSION

ifndef LOCAL_SDK_VERSION

  ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

  ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

    LOCAL_USE_VNDK:=true

    LOCAL_USE_VNDK:=true

    LOCAL_USE_VNDK_VENDOR:=true

    # Note: no need to check LOCAL_MODULE_PATH* since LOCAL_[VENDOR|ODM|OEM]_MODULE is already

    # Note: no need to check LOCAL_MODULE_PATH* since LOCAL_[VENDOR|ODM|OEM]_MODULE is already

    # set correctly before this is included.

    # set correctly before this is included.

  endif

  endif
@@ -40,6 +41,7 @@ ifdef LOCAL_USE_VNDK 
  # If we're not using the VNDK, drop all restrictions

  # If we're not using the VNDK, drop all restrictions

  ifndef BOARD_VNDK_VERSION

  ifndef BOARD_VNDK_VERSION

    LOCAL_USE_VNDK:=

    LOCAL_USE_VNDK:=

    LOCAL_USE_VNDK_VENDOR:=

    LOCAL_USE_VNDK_PRODUCT:=

    LOCAL_USE_VNDK_PRODUCT:=

  endif

  endif

endif

endif