commit d027dfa39f96fcd7e20966ca1d0db1819d7d37cb
author Martijn Coenen <maco@google.com> Wed Mar 14 11:05:19 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 14 11:05:19 2018 +0000
tree 0442c2ddc235395399491f02b42c4f7a601b814b
parent c30cc7d3432e5a3d701281a1c7364991a89e0d9c
parent 08f10d0529b91a1fc10f0506e839bdd4747feef6

Merge "Products launching with API 28 need 64-bit binder interface." into pi-dev

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 917729a..e4ed107 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -846,6 +846,13 @@
   ifneq ($(call numbers_less_than,$(PRODUCT_SHIPPING_API_LEVEL),$(BOARD_SYSTEMSDK_VERSIONS)),)
     $(error BOARD_SYSTEMSDK_VERSIONS ($(BOARD_SYSTEMSDK_VERSIONS)) must all be greater than or equal to PRODUCT_SHIPPING_API_LEVEL ($(PRODUCT_SHIPPING_API_LEVEL)))
   endif
+  ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),28),)
+    ifneq ($(TARGET_IS_64_BIT), true)
+      ifneq ($(TARGET_USES_64_BIT_BINDER), true)
+        $(error When PRODUCT_SHIPPING_API_LEVEL >= 28, TARGET_USES_64_BIT_BINDER must be true)
+      endif
+    endif
+  endif
 endif
 
 # The default key if not set as LOCAL_CERTIFICATE