Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1141)

Unified Diff: build/android/envsetup_functions.sh

Issue 11186014: Handles unknown TARGET_PRODUCT in envsetup.sh (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index da8a4ee57a3d4da47f250bb92b4da3f2bc061dfd..94749c20a548f375578f2a06233571c82de3a259 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -98,27 +98,50 @@ common_vars_defines() {
# and V8 mksnapshot.
case "${TARGET_PRODUCT}" in
"passion"|"soju"|"sojua"|"sojus"|"yakju"|"mysid"|"nakasi")
- DEFINES+=" arm_neon=1 armv7=1 arm_thumb=1"
- DEFINES+=" ${ORDER_DEFINES}"
TARGET_ARCH="arm"
+ TARGET_ARCH_VARIANT="armv7-a-neon"
;;
"trygon"|"tervigon")
- DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16"
- DEFINES+=" ${ORDER_DEFINES}"
TARGET_ARCH="arm"
+ TARGET_ARCH_VARIANT="armv7-a"
;;
"full")
- DEFINES+=" arm_neon=0 armv7=0 arm_thumb=1 arm_fpu=vfp"
TARGET_ARCH="arm"
+ TARGET_ARCH_VARIANT="armv5te"
;;
*x86*)
+ TARGET_ARCH_VARIANT="x86"
+ TARGET_ARCH="x86"
+ ;;
+ *)
+ if [ -z "${TARGET_ARCH_VARIANT}" ]; then
+ # Deal with unknown TARGET_PRODUCT. Try to get TARGET_ARCH_VARIANT
+ # if it is not defined yet.
+ if [ "$(type -t get_build_var)" == "function" ]; then
+ TARGET_ARCH_VARIANT=$(get_build_var TARGET_ARCH_VARIANT 2> /dev/null)
+ fi
+ fi
+ esac
+
+ case "${TARGET_ARCH_VARIANT}" in
+ "armv7-a-neon")
+ DEFINES+=" arm_neon=1 armv7=1 arm_thumb=1"
+ DEFINES+=" ${ORDER_DEFINES}"
+ ;;
+ "armv7-a")
+ DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16"
+ DEFINES+=" ${ORDER_DEFINES}"
+ ;;
+ "armv5te")
+ DEFINES+=" arm_neon=0 armv7=0 arm_thumb=1 arm_fpu=vfp"
+ ;;
+ "x86")
# TODO(tedbo): The ia32 build fails on ffmpeg, so we disable it here.
DEFINES+=" use_libffmpeg=0"
host_arch=$(uname -m | sed -e \
's/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/')
DEFINES+=" host_arch=${host_arch}"
- TARGET_ARCH="x86"
;;
*)
echo "TARGET_PRODUCT: ${TARGET_PRODUCT} is not supported." >& 2
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698