From 970bafbfae1e44109c079687a34c3cc1ba611a5f Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <>
Date: Fri, 27 Mar 2009 19:58:10 -0700
Subject: [PATCH] AI 143398: am: CL 143269 am: CL 143143 Update ADT changes.txt
 with JUnit features, and properly restrict ADT package access.   Original
 author: xav   Merged from: //branches/cupcake/...   Original author:
 android-build   Merged from: //branches/donutburger/...

Automated import of CL 143398
---
 tools/eclipse/changes.txt                                 | 1 +
 .../com.android.ide.eclipse.adt/META-INF/MANIFEST.MF      | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/eclipse/changes.txt b/tools/eclipse/changes.txt
index 8cd843e20..02d907585 100644
--- a/tools/eclipse/changes.txt
+++ b/tools/eclipse/changes.txt
@@ -5,6 +5,7 @@
     * Project properties (right click project in Package Explorer, then "Properties"), lets you edit project target.
     * New Launch configuration option to choose debug deployment target.
 - Ability to export multiple apk from one project, using resource filters. See the 'android' property for Android projects.
+- Support for running JUnit tests on a device/emulator from a new "Android JUnit tests" launch configuration.
 
 0.8.1:
 
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index c0dfcefd5..0ec97aa38 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -45,16 +45,16 @@ Require-Bundle: com.android.ide.eclipse.ddms,
  org.eclipse.ltk.core.refactoring,
  org.eclipse.ltk.ui.refactoring
 Eclipse-LazyStart: true
-Export-Package: com.android.ide.eclipse.adt,
+Export-Package: com.android.ide.eclipse.adt;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.adt.build;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.adt.launch;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.adt.project;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.adt.project.internal;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.adt.sdk;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.adt.wizards.newproject;x-friends:="com.android.ide.eclipse.tests",
- com.android.ide.eclipse.common,
- com.android.ide.eclipse.common.project,
- com.android.ide.eclipse.common.resources,
+ com.android.ide.eclipse.common;x-friends:="com.android.ide.eclipse.tests",
+ com.android.ide.eclipse.common.project;x-friends:="com.android.ide.eclipse.tests",
+ com.android.ide.eclipse.common.resources;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.editors;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.editors.descriptors;x-friends:="com.android.ide.eclipse.tests",
  com.android.ide.eclipse.editors.layout;x-friends:="com.android.ide.eclipse.tests",