commit dad6450cd3af1e102c5bdd07f0dd0e9869adf612
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 27 01:24:02 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 27 01:24:02 2018 +0000
tree 30d8e92d85ecca986852d9890889dd50c9f5cdc9
parent 3cf75cf2bb9f61f27e74af91c1811a92b7aa4982
parent 65c680e28568a5333bbf0c3e20d9be3ae3dcad7c

Merge "Set __ANDROID_API__ for vendor binaries to vndk version."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index c2fa27c..97429c3 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -225,7 +225,15 @@
 endif
 
 ifneq ($(LOCAL_USE_VNDK),)
-  my_cflags += -D__ANDROID_API__=__ANDROID_API_FUTURE__ -D__ANDROID_VNDK__
+  # Required VNDK version for vendor modules is BOARD_VNDK_VERSION.
+  my_vndk_version := $(BOARD_VNDK_VERSION)
+  ifeq ($(my_vndk_version),current)
+    # Build with current PLATFORM_VNDK_VERSION.
+    # If PLATFORM_VNDK_VERSION has a CODENAME, it will return
+    # __ANDROID_API_FUTURE__.
+    my_vndk_version := $(call codename-or-sdk-to-sdk,$(PLATFORM_VNDK_VERSION))
+  endif
+  my_cflags += -D__ANDROID_API__=$(my_vndk_version) -D__ANDROID_VNDK__
 endif
 
 ifndef LOCAL_IS_HOST_MODULE