am 0136501f: am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux...

Merge commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0' into eclair-mr2-plus-aosp

* commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

diff --git a/tools/ddms/app/etc/ddms b/tools/ddms/app/etc/ddms
index 873f19e..1367aeb 100755 (executable)
--- 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 75c9485..8feb5f2 100755 (executable)
--- 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 caac726..7035791 100755 (executable)
--- 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 "x$1" : 'x-J\(.*\)'`
     javaOpts="${javaOpts} -${opt}"