From 240d97a249286d5a3e90f9c77a497c0431e9d392 Mon Sep 17 00:00:00 2001
From: Jae Shin <jaeshin@google.com>
Date: Fri, 29 Dec 2017 15:21:14 +0900
Subject: [PATCH] Apply snapshot variant to vndk package module name

VNDK snapshot phony package, vndk_v$VER, is redefined to
separate phony packages per VNDK snapshot build variant,
vndk_v$VER_$VARIANT, where $VARIANT is defined as the primary
$TARGET_ARCH of the build target.

Accordingly, top level Android.bp file under prebuilts/vndk/v$VER
is redefined as separate Android.bp files for each snapshot
variant at prebuilts/vndk/v$VER/$VARIANT/Android.bp.

Test: m -j PRODUCT_EXTRA_VNDK_VERSIONS=27 (after installing
snapshot to prebuilts/vndk/v27)
Bug: 71370248

Change-Id: Ida449978090fe8a4f16376c991d34fa0945be596
---
 core/envsetup.mk               | 2 +-
 target/product/vndk/Android.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 89a39a8f0..255c02b69 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -287,7 +287,7 @@ endif
 # Check BOARD_VNDK_VERSION
 define check_vndk_version
   $(eval vndk_path := prebuilts/vndk/v$(1)) \
-  $(if $(wildcard $(vndk_path)/Android.bp),,$(error VNDK version $(1) not found))
+  $(if $(wildcard $(vndk_path)/*/Android.bp),,$(error VNDK version $(1) not found))
 endef
 
 ifdef BOARD_VNDK_VERSION
diff --git a/target/product/vndk/Android.mk b/target/product/vndk/Android.mk
index ea8c95e1a..a134d020b 100644
--- a/target/product/vndk/Android.mk
+++ b/target/product/vndk/Android.mk
@@ -94,9 +94,9 @@ LOCAL_REQUIRED_MODULES := \
     vndk_current
 else
 LOCAL_REQUIRED_MODULES := \
-    vndk_v$(BOARD_VNDK_VERSION)
+    vndk_v$(BOARD_VNDK_VERSION)_$(TARGET_ARCH)
 endif
 LOCAL_REQUIRED_MODULES += \
-    $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver))
+    $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH))
 include $(BUILD_PHONY_PACKAGE)
 endif # BOARD_VNDK_VERSION is set