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

Automated import from //branches/donutburger/...@141557,141557

Browse Source
This commit is contained in:
Xavier Ducrohet
2009-03-24 20:32:36 -07:00
committed by The Android Open Source Project
parent f791f113e1
commit 7b82e66c0d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/ApkBuilder.java
View File

@@ -979,7 +979,10 @@ public class ApkBuilder extends BaseBuilder {
writeStandardProjectResources(jarBuilder, javaProject, wsRoot, list); writeStandardProjectResources(jarBuilder, javaProject, wsRoot, list);
for (IJavaProject referencedJavaProject : referencedJavaProjects) { for (IJavaProject referencedJavaProject : referencedJavaProjects) {
if (referencedJavaProject.getProject().hasNature(AndroidConstants.NATURE)) { // only include output from non android referenced project
// (This is to handle the case of reference Android projects in the context of
// instrumentation projects that need to reference the projects to be tested).
if (referencedJavaProject.getProject().hasNature(AndroidConstants.NATURE) == false) {
writeStandardProjectResources(jarBuilder, referencedJavaProject, wsRoot, list); writeStandardProjectResources(jarBuilder, referencedJavaProject, wsRoot, list);
} }
} }
@@ -1084,7 +1087,10 @@ public class ApkBuilder extends BaseBuilder {
IWorkspaceRoot wsRoot = ws.getRoot(); IWorkspaceRoot wsRoot = ws.getRoot();
for (IJavaProject javaProject : referencedJavaProjects) { for (IJavaProject javaProject : referencedJavaProjects) {
if (javaProject.getProject().hasNature(AndroidConstants.NATURE)) { // only include output from non android referenced project
// (This is to handle the case of reference Android projects in the context of
// instrumentation projects that need to reference the projects to be tested).
if (javaProject.getProject().hasNature(AndroidConstants.NATURE) == false) {
// get the output folder // get the output folder
IPath path = null; IPath path = null;
try { try {