From 91a2c729643766b90c3ffd011c84756b25b5cbe8 Mon Sep 17 00:00:00 2001
From: Jae Shin <jaeshin@google.com>
Date: Wed, 22 Nov 2017 14:06:27 +0900
Subject: [PATCH] Change VNDK snapshot build variant to 'user'

Additionally build for all four archs separately:
(arch, variant) =
(arm64, armv8-a)
(arm, armv7-a-neon)
(x86_64, x86_64)
(x86, x86)

Test: development/vndk/snapshot/build.sh
Bug: 66059995
Change-Id: Ia31bc260d18e09a9499708c777e2374431470b4e
---
 vndk/snapshot/build.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/vndk/snapshot/build.sh b/vndk/snapshot/build.sh
index 9bb768b7c..6a6a2f8cb 100755
--- a/vndk/snapshot/build.sh
+++ b/vndk/snapshot/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 #
 # Copyright (C) 2017 The Android Open Source Project
 #
@@ -15,13 +15,17 @@
 # limitations under the License.
 #
 
-TARGET_BUILD_VARIANT=userdebug
+export TARGET_BUILD_VARIANT=user
+export BOARD_VNDK_VERSION=current
 
-echo "-----Source build/envsetup.sh"
-source build/envsetup.sh
+echo "-----Generating VNDK snapshot for arm64-armv8-a"
+make -j vndk dist TARGET_PRODUCT=aosp_arm64_ab
 
-echo "-----Generating VNDK snapshot for arm, arm64"
-make -j vndk dist TARGET_PRODUCT=aosp_arm64_ab TARGET_BUILD_VARIANT=$TARGET_BUILD_VARIANT BOARD_VNDK_VERSION=current
+echo "-----Generating VNDK snapshot for arm-armv7-a-neon"
+make -j vndk dist TARGET_PRODUCT=aosp_arm
 
-echo "-----Generating VNDK snapshot for x86, x86_64"
-make -j vndk dist TARGET_PRODUCT=aosp_x86_64 TARGET_BUILD_VARIANT=$TARGET_BUILD_VARIANT BOARD_VNDK_VERSION=current
+echo "-----Generating VNDK snapshot for x86_64-x86_64"
+make -j vndk dist TARGET_PRODUCT=aosp_x86_64
+
+echo "-----Generating VNDK snapshot for x86-x86"
+make -j vndk dist TARGET_PRODUCT=aosp_x86