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

Side by Side Diff: platform_tools/android/bin/android_setup.sh

Issue 916113002: Don't use m32 cflag for x86_64. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselijne
Patch Set: Make desktops distinguish between x86 and x86_64 Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « gyp/skia_lib.gyp ('k') | platform_tools/android/bin/gyp_to_android.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # 2 #
3 # android_setup.sh: Sets environment variables used by other Android scripts. 3 # android_setup.sh: Sets environment variables used by other Android scripts.
4 4
5 # Fail-fast if anything in the script fails. 5 # Fail-fast if anything in the script fails.
6 set -e 6 set -e
7 7
8 BUILDTYPE=${BUILDTYPE-Debug} 8 BUILDTYPE=${BUILDTYPE-Debug}
9 9
10 while (( "$#" )); do 10 while (( "$#" )); do
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 xoom) 109 xoom)
110 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_version=7 arm_thumb= 1" 110 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_version=7 arm_thumb= 1"
111 ANDROID_ARCH="arm" 111 ANDROID_ARCH="arm"
112 ;; 112 ;;
113 galaxy_nexus) 113 galaxy_nexus)
114 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb= 1" 114 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb= 1"
115 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" 115 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
116 ANDROID_ARCH="arm" 116 ANDROID_ARCH="arm"
117 ;; 117 ;;
118 intel_rhb | razr_i) 118 intel_rhb | razr_i)
119 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" 119 DEFINES="${DEFINES} skia_arch_type=x86"
120 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" 120 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
121 ANDROID_ARCH="x86" 121 ANDROID_ARCH="x86"
122 ;; 122 ;;
123 x86) 123 x86)
124 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" 124 DEFINES="${DEFINES} skia_arch_type=x86"
125 ANDROID_ARCH="x86" 125 ANDROID_ARCH="x86"
126 ;; 126 ;;
127 x86_64 | x64) 127 x86_64 | x64)
128 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64" 128 DEFINES="${DEFINES} skia_arch_type=x86_64"
129 ANDROID_ARCH="x86_64" 129 ANDROID_ARCH="x86_64"
130 ;; 130 ;;
131 arm_v7) 131 arm_v7)
132 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a rm_thumb=0" 132 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a rm_thumb=0"
133 ANDROID_ARCH="arm" 133 ANDROID_ARCH="arm"
134 ;; 134 ;;
135 arm_v7_thumb | nvidia_logan | nexus_5) 135 arm_v7_thumb | nvidia_logan | nexus_5)
136 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a rm_thumb=1" 136 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a rm_thumb=1"
137 ANDROID_ARCH="arm" 137 ANDROID_ARCH="arm"
138 ;; 138 ;;
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 adb_push_if_needed $HOST_SRC $ANDROID_DST 264 adb_push_if_needed $HOST_SRC $ANDROID_DST
265 else 265 else
266 echo -n "$ANDROID_DST " 266 echo -n "$ANDROID_DST "
267 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" 267 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
268 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST 268 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
269 fi 269 fi
270 fi 270 fi
271 } 271 }
272 272
273 setup_device "${DEVICE_ID}" 273 setup_device "${DEVICE_ID}"
OLDNEW
« no previous file with comments | « gyp/skia_lib.gyp ('k') | platform_tools/android/bin/gyp_to_android.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698