Fix android.bat for Windows SDK.

android.bat was not properly copying swtmenbar.jar
to the temp folder, so it wasn't found at runtime.

Also added some debug info wrapping the menu bar usage
and a comment on how to remotely debug the swtmanager.

(cherry picked from commit 0447f74bfd36d3c458f478fa637eee377f313f3f)

Change-Id: Ib10d974a518e65ae38f66af641ccbf8cb85689d3

diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat
index 0d83734..f616dd7 100755 (executable)
--- a/sdkmanager/app/etc/android.bat
+++ b/sdkmanager/app/etc/android.bat
@@ -60,6 +60,7 @@ if not "%1"=="" goto EndTempCopy
     copy /B /D /Y lib\sdk*               %tmp_dir%\lib\        > nul\r
     copy /B /D /Y lib\common.jar         %tmp_dir%\lib\        > nul\r
     copy /B /D /Y lib\commons-compress*  %tmp_dir%\lib\        > nul\r
+    copy /B /D /Y lib\swtmenubar.jar     %tmp_dir%\lib\        > nul\r
 \r
     rem jar_path and swt_path are relative to PWD so we don't need to adjust them, just change dirs.\r
     set tools_dir=%cd%\r
@@ -77,6 +78,7 @@ if exist %swt_path% goto SetPath
 \r
 :SetPath\r
 rem Finally exec the java program and end here.\r
-call %java_exe% -Dcom.android.sdkmanager.toolsdir="%tools_dir%" -Dcom.android.sdkmanager.workdir=%work_dir% -classpath "%jar_path%;%swt_path%\swt.jar" com.android.sdkmanager.Main %*\r
+REM set REMOTE_DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000\r
+call %java_exe% %REMOTE_DEBUG% -Dcom.android.sdkmanager.toolsdir="%tools_dir%" -Dcom.android.sdkmanager.workdir=%work_dir% -classpath "%jar_path%;%swt_path%\swt.jar" com.android.sdkmanager.Main %*\r
 \r
 rem EOF\r

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerWindowImpl1.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerWindowImpl1.java
index 7357641..69d4619 100755 (executable)
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerWindowImpl1.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerWindowImpl1.java
@@ -229,24 +229,29 @@ public class AvdManagerWindowImpl1 {
             // would fail to load. The MenuBarWrapper below helps to make\r
             // that indirection.\r
 \r
-            new MenuBarWrapper(APP_NAME_MAC_MENU, menuTools) {\r
-                @Override\r
-                public void onPreferencesMenuSelected() {\r
-                    showRegisteredPage(Purpose.SETTINGS);\r
-                }\r
+            try {\r
+                new MenuBarWrapper(APP_NAME_MAC_MENU, menuTools) {\r
+                    @Override\r
+                    public void onPreferencesMenuSelected() {\r
+                        showRegisteredPage(Purpose.SETTINGS);\r
+                    }\r
 \r
-                @Override\r
-                public void onAboutMenuSelected() {\r
-                    showRegisteredPage(Purpose.ABOUT_BOX);\r
-                }\r
+                    @Override\r
+                    public void onAboutMenuSelected() {\r
+                        showRegisteredPage(Purpose.ABOUT_BOX);\r
+                    }\r
 \r
-                @Override\r
-                public void printError(String format, Object... args) {\r
-                    if (mUpdaterData != null) {\r
-                        mUpdaterData.getSdkLog().error(null, format, args);\r
+                    @Override\r
+                    public void printError(String format, Object... args) {\r
+                        if (mUpdaterData != null) {\r
+                            mUpdaterData.getSdkLog().error(null, format, args);\r
+                        }\r
                     }\r
-                }\r
-            };\r
+                };\r
+            } catch (Exception e) {\r
+                mUpdaterData.getSdkLog().error(e, "Failed to setup menu bar");\r
+                e.printStackTrace();\r
+            }\r
         }\r
     }\r
 \r

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java
index 4be4448..3ba9887 100755 (executable)
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java
@@ -305,24 +305,29 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow {
             // would fail to load. The MenuBarWrapper below helps to make\r
             // that indirection.\r
 \r
-            new MenuBarWrapper(APP_NAME, menuTools) {\r
-                @Override\r
-                public void onPreferencesMenuSelected() {\r
-                    showRegisteredPage(Purpose.SETTINGS);\r
-                }\r
+            try {\r
+                new MenuBarWrapper(APP_NAME, menuTools) {\r
+                    @Override\r
+                    public void onPreferencesMenuSelected() {\r
+                        showRegisteredPage(Purpose.SETTINGS);\r
+                    }\r
 \r
-                @Override\r
-                public void onAboutMenuSelected() {\r
-                    showRegisteredPage(Purpose.ABOUT_BOX);\r
-                }\r
+                    @Override\r
+                    public void onAboutMenuSelected() {\r
+                        showRegisteredPage(Purpose.ABOUT_BOX);\r
+                    }\r
 \r
-                @Override\r
-                public void printError(String format, Object... args) {\r
-                    if (mUpdaterData != null) {\r
-                        mUpdaterData.getSdkLog().error(null, format, args);\r
+                    @Override\r
+                    public void printError(String format, Object... args) {\r
+                        if (mUpdaterData != null) {\r
+                            mUpdaterData.getSdkLog().error(null, format, args);\r
+                        }\r
                     }\r
-                }\r
-            };\r
+                };\r
+            } catch (Exception e) {\r
+                mUpdaterData.getSdkLog().error(e, "Failed to setup menu bar");\r
+                e.printStackTrace();\r
+            }\r
         }\r
     }\r
 \r