aboutsummaryrefslogtreecommitdiffstats
path: root/build/tools.atree
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-03-06 12:08:49 -0800
committerXavier Ducrohet <xav@android.com>2012-03-06 12:30:10 -0800
commit1bdd1764193c7d85649b09d66d6a0bc838c35d46 (patch)
tree68aa00e411a388b60726690d63a7fa91788ea6cb /build/tools.atree
parent3bd2a615de043eb86648671f29376f32230701a2 (diff)
downloadsdk-1bdd1764193c7d85649b09d66d6a0bc838c35d46.zip
sdk-1bdd1764193c7d85649b09d66d6a0bc838c35d46.tar.gz
sdk-1bdd1764193c7d85649b09d66d6a0bc838c35d46.tar.bz2
Properly disconnect the sdk controller when needed.
This is a temporary fix before we move to a full service. Also package the MT controller app in the SDK. Change-Id: Ib8a11f3b69d5545c9f428cbf65b27d903699e7b8
Diffstat (limited to 'build/tools.atree')
-rw-r--r--build/tools.atree4
1 files changed, 1 insertions, 3 deletions
diff --git a/build/tools.atree b/build/tools.atree
index 8fc262c..03868e2 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -146,9 +146,7 @@ prebuilts/tools/common/proguard/proguard4.7/bin/retrace.sh tools/proguard/bi
prebuilts/tools/common/proguard/proguard4.7/src/proguard/ant/task.properties tools/proguard/ant/task.properties
# SDK Controller
-#sdk/apps/SdkController tools/apps/SdkController
-sdk/apps/SdkController/SdkControllerLib tools/apps/SdkController/SdkControllerLib
-sdk/apps/SdkController/SdkControllerSensor tools/apps/SdkController/SdkControllerSensor
+sdk/apps/SdkController tools/apps/SdkController
# tools specific support jar
framework/annotations.jar tools/support/annotations.jar