DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compile error, and compile scandroid in Maven build

This commit is contained in:
Manu Sridharan 2014-11-24 14:37:46 -08:00
parent e4b113d33f
commit b461107837
5 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
com.ibm.wala.dalvik/META-INF/MANIFEST.MF
View File

@ -3,14 +3,12 @@ Bundle-ManifestVersion: 2
Bundle-Name: WALA Dalvik Bytecode Frontend
Bundle-SymbolicName: com.ibm.wala.dalvik
Bundle-Version: 1.3.4.qualifier
Bundle-ClassPath: dalvik.jar,
lib/commons-cli-1.2.jar,
lib/commons-io-2.4.jar,
lib/commons-lang3-3.1.jar,
lib/dexlib-1.3.4-dev.jar,
lib/logback-classic-1.0.9.jar,
lib/logback-core-1.0.9.jar,
lib/slf4j-api-1.7.2.jar
Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
com.ibm.wala.core;bundle-version="1.1.3",
com.ibm.wala.ide;bundle-version="1.1.3",
com.ibm.wala.shrike;bundle-version="1.3.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: ch.qos.logback.classic,
ch.qos.logback.classic.boolex,
ch.qos.logback.classic.db,
@ -107,8 +105,13 @@ Export-Package: ch.qos.logback.classic,
org.slf4j.helpers,
org.slf4j.impl,
org.slf4j.spi
Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
com.ibm.wala.core;bundle-version="1.1.3",
com.ibm.wala.ide;bundle-version="1.1.3",
com.ibm.wala.shrike;bundle-version="1.3.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: dalvik.jar,
lib/commons-cli-1.2.jar,
lib/commons-io-2.4.jar,
lib/commons-lang3-3.1.jar,
lib/dexlib-1.3.4-dev.jar,
lib/logback-classic-1.0.9.jar,
lib/logback-core-1.0.9.jar,
lib/slf4j-api-1.7.2.jar,
lib/guava-13.0.1.jar

4
com.ibm.wala.scandroid/META-INF/MANIFEST.MF
View File

@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SCanDroid
Bundle-SymbolicName: com.ibm.wala.scandroid
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 1.3.4.qualifier
Bundle-Activator: com.ibm.wala.scandroid.Activator
Bundle-Vendor: IBM
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
com.ibm.wala.dalvik;bundle-version="1.0.0",
com.ibm.wala.dalvik;bundle-version="1.3.4",
com.ibm.wala.core;bundle-version="1.3.4",
com.ibm.wala.shrike;bundle-version="1.3.4"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7

12
com.ibm.wala.scandroid/pom.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.4-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.scandroid</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

2
com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java
View File

@ -137,7 +137,7 @@ public class AndroidAnalysisContext {
ClassHierarchyException, URISyntaxException {
logger.debug(DefaultSCanDroidOptions.dumpString(options));
this.options = options;
scope = AndroidAnalysisScope.setUpAndroidAnalysisScope(options.getAndroidLibrary(), options.getClasspath(), exclusions);
scope = AndroidAnalysisScope.setUpAndroidAnalysisScope(options.getClasspath(), exclusions, options.getAndroidLibrary());
cha = ClassHierarchy.make(scope);

1
pom.xml
View File

@ -50,6 +50,7 @@
<module>com.ibm.wala.ide.jdt.test</module>
<module>com.ibm.wala.dalvik</module>
<module>com.ibm.wala.scandroid</module>
<module>com.ibm.wala-repository</module>