From 43a7f0c765462453e541d8d1e6211d6d83f1badd Mon Sep 17 00:00:00 2001
From: Vijay Venkatraman <vijaykv@google.com>
Date: Tue, 20 Dec 2016 17:50:21 +0000
Subject: [PATCH] Revert "Revert "Extends VNDK support in Make by setting
 LOCAL_USE_VNDK for modules going into vendor partition, except when they
 already have LOCAL_SDK_VERSION set.""

This reverts commit 823172e209ab92dbae6dd5a4ef750f73dbfc5aa8.

Test: build.ninja for any target doesnt change, unless
BOARD_VNDK_VERSION is turned on in BoardConfig.mk
Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
---
 core/local_vndk.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/core/local_vndk.mk b/core/local_vndk.mk
index f81249b26..f7970f0cd 100644
--- a/core/local_vndk.mk
+++ b/core/local_vndk.mk
@@ -1,3 +1,18 @@
+
+#Set LOCAL_USE_VNDK for modules going into vendor partition, except for host modules
+#If LOCAL_SDK_VERSION is set, thats a more restrictive set, so they dont need LOCAL_USE_VNDK
+ifndef LOCAL_IS_HOST_MODULE
+ifndef LOCAL_SDK_VERSION
+  ifneq (,$(filter true,$(LOCAL_PROPRIETARY_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE)))
+    LOCAL_USE_VNDK:=true
+  else
+    ifneq (,$(filter $(TARGET_OUT_VENDOR)%,$(LOCAL_MODULE_PATH) $(LOCAL_MODULE_PATH_32) $(LOCAL_MODULE_PATH_64)))
+      LOCAL_USE_VNDK:=true
+    endif
+  endif
+endif
+endif
+
 # Verify LOCAL_USE_VNDK usage, and set LOCAL_SDK_VERSION if necessary
 
 ifdef LOCAL_IS_HOST_MODULE