Merge "SDK prebuilts: reorganize into tools/lib."
diff --git a/etc/jobb b/tools/jobb
similarity index 100%
rename from etc/jobb
rename to tools/jobb
diff --git a/etc/jobb.bat b/tools/jobb.bat
similarity index 100%
rename from etc/jobb.bat
rename to tools/jobb.bat
diff --git a/assetstudio.jar b/tools/lib/assetstudio.jar
similarity index 100%
rename from assetstudio.jar
rename to tools/lib/assetstudio.jar
Binary files differ
diff --git a/common.jar b/tools/lib/common.jar
similarity index 100%
rename from common.jar
rename to tools/lib/common.jar
Binary files differ
diff --git a/ddmlib.jar b/tools/lib/ddmlib.jar
similarity index 100%
rename from ddmlib.jar
rename to tools/lib/ddmlib.jar
Binary files differ
diff --git a/dvlib.jar b/tools/lib/dvlib.jar
similarity index 100%
rename from dvlib.jar
rename to tools/lib/dvlib.jar
Binary files differ
diff --git a/jobb.jar b/tools/lib/jobb.jar
similarity index 100%
rename from jobb.jar
rename to tools/lib/jobb.jar
Binary files differ
diff --git a/layoutlib_api.jar b/tools/lib/layoutlib_api.jar
similarity index 100%
rename from layoutlib_api.jar
rename to tools/lib/layoutlib_api.jar
Binary files differ
diff --git a/lint.jar b/tools/lib/lint.jar
similarity index 100%
rename from lint.jar
rename to tools/lib/lint.jar
Binary files differ
diff --git a/lint_api.jar b/tools/lib/lint_api.jar
similarity index 100%
rename from lint_api.jar
rename to tools/lib/lint_api.jar
Binary files differ
diff --git a/lint_checks.jar b/tools/lib/lint_checks.jar
similarity index 100%
rename from lint_checks.jar
rename to tools/lib/lint_checks.jar
Binary files differ
diff --git a/manifmerger.jar b/tools/lib/manifmerger.jar
similarity index 100%
rename from manifmerger.jar
rename to tools/lib/manifmerger.jar
Binary files differ
diff --git a/sdk_common.jar b/tools/lib/sdk_common.jar
similarity index 100%
rename from sdk_common.jar
rename to tools/lib/sdk_common.jar
Binary files differ
diff --git a/sdklib.jar b/tools/lib/sdklib.jar
similarity index 100%
rename from sdklib.jar
rename to tools/lib/sdklib.jar
Binary files differ
diff --git a/sdkuilib.jar b/tools/lib/sdkuilib.jar
similarity index 100%
rename from sdkuilib.jar
rename to tools/lib/sdkuilib.jar
Binary files differ
diff --git a/swtmenubar.jar b/tools/lib/swtmenubar.jar
similarity index 100%
rename from swtmenubar.jar
rename to tools/lib/swtmenubar.jar
Binary files differ
diff --git a/etc/lint b/tools/lint
similarity index 100%
rename from etc/lint
rename to tools/lint
diff --git a/etc/lint.bat b/tools/lint.bat
similarity index 100%
rename from etc/lint.bat
rename to tools/lint.bat
diff --git a/update_jars.sh b/update_jars.sh
index 938db99..15ca132 100755
--- a/update_jars.sh
+++ b/update_jars.sh
@@ -40,10 +40,10 @@
   add_project common
   add_project ddmlib
   add_project dvlib
-  add_project jobb            etc/jobb etc/jobb.bat
+  add_project jobb            "etc/jobb|tools/jobb" "etc/jobb.bat|tools/jobb.bat"
   add_project layoutlib_api
   add_project lint_api
-  add_project lint            "cli/etc/lint|etc/lint" "cli/etc/lint.bat|etc/lint.bat"
+  add_project lint            "cli/etc/lint|tools/lint" "cli/etc/lint.bat|tools/lint.bat"
   add_project lint_checks
   add_project manifmerger
   #add_project rule_api -- TODO do this one next