Handles unknown TARGET_PRODUCT in envsetup.sh

build/android/envsetup_functions.sh

 #!/bin/bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
@@ skipping 80 matching lines @@
   # shared library, libchromeview.so.  The file is an order list of section
   # names and the library is linked with option
   # --section-ordering-file=<orderfile>. The order file is updated by profiling
   # startup after compiling with the order_profiling=1 GYP_DEFINES flag.
   ORDER_DEFINES="order_text_section=${CHROME_SRC}/orderfiles/orderfile.out"
 
   # The following defines will affect ARM code generation of both C/C++ compiler
   # and V8 mksnapshot.
   case "${TARGET_PRODUCT}" in
     "passion"|"soju"|"sojua"|"sojus"|"yakju"|"mysid"|"nakasi")
+      TARGET_ARCH="arm"
+      TARGET_ARCH_VARIANT="armv7-a-neon"
+      ;;
+    "trygon"|"tervigon")
+      TARGET_ARCH="arm"
+      TARGET_ARCH_VARIANT="armv7-a"
+      ;;
+    "full")
+      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}"
-      TARGET_ARCH="arm"
       ;;
-    "trygon"|"tervigon")
+    "armv7-a")
       DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16"
       DEFINES+=" ${ORDER_DEFINES}"
-      TARGET_ARCH="arm"
       ;;
-    "full")
+    "armv5te")
       DEFINES+=" arm_neon=0 armv7=0 arm_thumb=1 arm_fpu=vfp"
-      TARGET_ARCH="arm"
       ;;
-    *x86*)
+    "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
       return 1
   esac
 
   case "${TARGET_ARCH}" in
     "arm")
       DEFINES+=" target_arch=arm"
       ;;
@@ skipping 193 matching lines @@
   export GYP_DEFINES="${DEFINES}"
 
   export GYP_GENERATORS="android"
 
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
 
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
 }