Merge "Move adb to the platform-tools."
This commit is contained in:
@@ -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
|
||||||
@@ -84,7 +83,8 @@ 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/hierarchyviewerlib.jar tools/lib/hierarchyviewerlib.jar
|
||||||
framework/draw9patch.jar tools/lib/draw9patch.jar
|
framework/draw9patch.jar tools/lib/draw9patch.jar
|
||||||
framework/layoutopt.jar tools/lib/layoutopt.jar
|
framework/layoutopt.jar tools/lib/layoutopt.jar
|
||||||
framework/uix.jar tools/lib/uix.jar
|
framework/uix.jar tools/lib/uix.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,
|
||||||
|
|||||||
Reference in New Issue
Block a user