summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-11-29 04:59:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-11-29 04:59:01 +0000
commit44e88d141126abea02fc7112d3224d3ace7da9a2 (patch)
treeff826280f4e14ab67eece6dead2028686666a25d
parentea2eb3b92a56ecac5f62bb13ae0ef4ac40152f91 (diff)
parent91a2c729643766b90c3ffd011c84756b25b5cbe8 (diff)
downloaddevelopment-44e88d141126abea02fc7112d3224d3ace7da9a2.tar.gz
Merge "Change VNDK snapshot build variant to 'user'"android-o-mr1-iot-preview-6o-mr1-iot-preview-6
-rwxr-xr-xvndk/snapshot/build.sh20
1 files 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