From 4bf2ce27a00c564daf0831c16769ee1ca259ddc7 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 2 Nov 2009 14:54:29 -0800 Subject: [PATCH] SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts SDK BUG 2232091 Change-Id: I2a000054545b7865769054d1fdc733e50f06edd5 --- tools/ddms/app/etc/ddms | 4 ++++ tools/sdkmanager/app/etc/android | 4 ++++ tools/traceview/etc/traceview | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/tools/ddms/app/etc/ddms b/tools/ddms/app/etc/ddms index 873f19e94..1367aeb4d 100755 --- a/tools/ddms/app/etc/ddms +++ b/tools/ddms/app/etc/ddms @@ -71,6 +71,10 @@ else os_opts= fi +if [ `uname` = "Linux" ]; then + export GDK_NATIVE_WINDOWS=true +fi + jarpath="$frameworkdir/$jarfile" # Figure out the path to the swt.jar for the current architecture. diff --git a/tools/sdkmanager/app/etc/android b/tools/sdkmanager/app/etc/android index 75c9485b2..8feb5f263 100755 --- a/tools/sdkmanager/app/etc/android +++ b/tools/sdkmanager/app/etc/android @@ -71,6 +71,10 @@ else os_opts= fi +if [ `uname` = "Linux" ]; then + export GDK_NATIVE_WINDOWS=true +fi + if [ "$OSTYPE" = "cygwin" ] ; then jarpath=`cygpath -w "$frameworkdir/$jarfile"` progdir=`cygpath -w "$progdir"` diff --git a/tools/traceview/etc/traceview b/tools/traceview/etc/traceview index 3d1771fbc..065cd0f9c 100755 --- a/tools/traceview/etc/traceview +++ b/tools/traceview/etc/traceview @@ -63,6 +63,10 @@ else javaOpts="-Xmx1600M" fi +if [ `uname` = "Linux" ]; then + export GDK_NATIVE_WINDOWS=true +fi + while expr "x$1" : 'x-J' >/dev/null; do opt=`expr "$1" : '-J\(.*\)'` javaOpts="${javaOpts} -${opt}"