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

Merge commit 'remotes/korg/cupcake'

Browse Source 
Conflicts:
	build/sdk.atree
	ide/eclipse/.classpath
	tools/activitycreator/src/com/android/activitycreator/ActivityCreator.java
	tools/eclipse/scripts/create_adt_symlinks.sh
	tools/eclipse/scripts/create_all_symlinks.sh
	tools/eclipse/scripts/create_bridge_symlinks.sh
	tools/eclipse/scripts/create_common_symlinks.sh
	tools/eclipse/scripts/create_ddms_symlinks.sh
	tools/eclipse/scripts/create_editors_symlinks.sh
	tools/eclipse/scripts/create_test_symlinks.sh
	tools/scripts/build.template
This commit is contained in:
Jean-Baptiste Queru
2008-12-19 08:04:59 -08:00
parent 712bebb0fa e943f2fd8e
commit 303a8c73c9
656 changed files with 47129 additions and 9826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Dalvik Debug Monitor Service
Bundle-SymbolicName: com.android.ide.eclipse.ddms;singleton:=true
Bundle-Version: 0.8.1.qualifier
Bundle-Version: 0.9.0.qualifier
Bundle-Activator: com.android.ide.eclipse.ddms.DdmsPlugin
Bundle-Vendor: The Android Open Source Project
Bundle-Localization: plugin
@@ -10,11 +10,13 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.console
Eclipse-LazyStart: true
Export-Package: com.android.ide.eclipse.ddms,
com.android.ide.eclipse.ddms.views,
com.android.ddmlib,
Export-Package: com.android.ddmlib,
com.android.ddmlib.log,
com.android.ddmlib.testrunner,
com.android.ddmuilib,
com.android.ddmuilib.console
com.android.ddmuilib.console,
com.android.ide.eclipse.ddms,
com.android.ide.eclipse.ddms.views
Bundle-ClassPath: libs/jcommon-1.0.12.jar,
libs/jfreechart-1.0.9.jar,
libs/jfreechart-1.0.9-swt.jar,