LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Move adb to the platform-tools."

Browse Source
This commit is contained in:
Xavier Ducrohet
2010-09-27 16:24:25 -07:00
committed by Android Code Review
parent 2f613967a0 6a8e50f695
commit 64e53fe5dd
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
build/sdk.atree
View File

@@ -39,7 +39,6 @@ sdk/files/tools_source.properties tools/source.properties
sdk/files/plugin.prop tools/lib/plugin.prop sdk/files/plugin.prop tools/lib/plugin.prop
# native host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/ # native host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
bin/adb tools/adb
bin/sqlite3 tools/sqlite3 bin/sqlite3 tools/sqlite3
bin/dmtracedump tools/dmtracedump bin/dmtracedump tools/dmtracedump
bin/etc1tool tools/etc1tool bin/etc1tool tools/etc1tool
@@ -51,12 +50,12 @@ bin/zipalign tools/zipalign
bin/emulator tools/emulator bin/emulator tools/emulator
# Java-Based SDK Tools # Java-Based SDK Tools
bin/ddms tools/ddms bin/ddms tools/ddms
bin/hierarchyviewer tools/hierarchyviewer bin/hierarchyviewer tools/hierarchyviewer
bin/draw9patch tools/draw9patch bin/draw9patch tools/draw9patch
bin/layoutopt tools/layoutopt bin/layoutopt tools/layoutopt
bin/traceview tools/traceview bin/traceview tools/traceview
bin/android tools/android bin/android tools/android
# sdk.git Ant templates for project build files # sdk.git Ant templates for project build files
@@ -77,22 +76,23 @@ external/qemu/android/avd/hardware-properties.ini tools/lib/hardware-properties.
sdk/files/android.el tools/lib/android.el sdk/files/android.el tools/lib/android.el
# Java Libraries for the tools # Java Libraries for the tools
framework/androidprefs.jar tools/lib/androidprefs.jar framework/androidprefs.jar tools/lib/androidprefs.jar
sdk/apkbuilder/etc/apkbuilder tools/apkbuilder sdk/apkbuilder/etc/apkbuilder tools/apkbuilder
framework/sdkstats.jar tools/lib/sdkstats.jar framework/sdkstats.jar tools/lib/sdkstats.jar
framework/archquery.jar tools/lib/archquery.jar framework/archquery.jar tools/lib/archquery.jar
framework/ddms.jar tools/lib/ddms.jar framework/ddms.jar tools/lib/ddms.jar
framework/ddmlib.jar tools/lib/ddmlib.jar framework/ddmlib.jar tools/lib/ddmlib.jar
framework/ddmuilib.jar tools/lib/ddmuilib.jar framework/ddmuilib.jar tools/lib/ddmuilib.jar
framework/hierarchyviewer.jar tools/lib/hierarchyviewer.jar framework/hierarchyviewer2.jar tools/lib/hierarchyviewer2.jar
framework/draw9patch.jar tools/lib/draw9patch.jar framework/hierarchyviewerlib.jar tools/lib/hierarchyviewerlib.jar
framework/layoutopt.jar tools/lib/layoutopt.jar framework/draw9patch.jar tools/lib/draw9patch.jar
framework/uix.jar tools/lib/uix.jar framework/layoutopt.jar tools/lib/layoutopt.jar
framework/traceview.jar tools/lib/traceview.jar framework/uix.jar tools/lib/uix.jar
framework/anttasks.jar tools/lib/anttasks.jar framework/traceview.jar tools/lib/traceview.jar
framework/sdklib.jar tools/lib/sdklib.jar framework/anttasks.jar tools/lib/anttasks.jar
framework/sdkuilib.jar tools/lib/sdkuilib.jar framework/sdklib.jar tools/lib/sdklib.jar
framework/sdkmanager.jar tools/lib/sdkmanager.jar framework/sdkuilib.jar tools/lib/sdkuilib.jar
framework/sdkmanager.jar tools/lib/sdkmanager.jar
# 3rd Party java libraries # 3rd Party java libraries
framework/swing-worker-1.1.jar tools/lib/swing-worker-1.1.jar framework/swing-worker-1.1.jar tools/lib/swing-worker-1.1.jar
@@ -128,6 +128,7 @@ external/proguard/src/proguard/ant/task.properties tools/proguard/ant
############################################################################## ##############################################################################
# host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/ # host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
bin/adb platform-tools/adb
bin/aapt platform-tools/aapt bin/aapt platform-tools/aapt
bin/aidl platform-tools/aidl bin/aidl platform-tools/aidl
# dx # dx
@@ -225,7 +226,6 @@ frameworks/base/docs/docs-samples-redirect.html docs/samples/index.html
# Samples Component # Samples Component
############################################################################## ##############################################################################
# samples to include in the sdk samples package # samples to include in the sdk samples package
# #
# the list here should match the list of samples that we generate docs for, # the list here should match the list of samples that we generate docs for,