Fix compile error, and compile scandroid in Maven build
This commit is contained in:
parent
e4b113d33f
commit
b461107837
|
@ -3,14 +3,12 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: WALA Dalvik Bytecode Frontend
|
Bundle-Name: WALA Dalvik Bytecode Frontend
|
||||||
Bundle-SymbolicName: com.ibm.wala.dalvik
|
Bundle-SymbolicName: com.ibm.wala.dalvik
|
||||||
Bundle-Version: 1.3.4.qualifier
|
Bundle-Version: 1.3.4.qualifier
|
||||||
Bundle-ClassPath: dalvik.jar,
|
Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
|
||||||
lib/commons-cli-1.2.jar,
|
com.ibm.wala.core;bundle-version="1.1.3",
|
||||||
lib/commons-io-2.4.jar,
|
com.ibm.wala.ide;bundle-version="1.1.3",
|
||||||
lib/commons-lang3-3.1.jar,
|
com.ibm.wala.shrike;bundle-version="1.3.1"
|
||||||
lib/dexlib-1.3.4-dev.jar,
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
lib/logback-classic-1.0.9.jar,
|
Bundle-ActivationPolicy: lazy
|
||||||
lib/logback-core-1.0.9.jar,
|
|
||||||
lib/slf4j-api-1.7.2.jar
|
|
||||||
Export-Package: ch.qos.logback.classic,
|
Export-Package: ch.qos.logback.classic,
|
||||||
ch.qos.logback.classic.boolex,
|
ch.qos.logback.classic.boolex,
|
||||||
ch.qos.logback.classic.db,
|
ch.qos.logback.classic.db,
|
||||||
|
@ -107,8 +105,13 @@ Export-Package: ch.qos.logback.classic,
|
||||||
org.slf4j.helpers,
|
org.slf4j.helpers,
|
||||||
org.slf4j.impl,
|
org.slf4j.impl,
|
||||||
org.slf4j.spi
|
org.slf4j.spi
|
||||||
Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
|
Bundle-ClassPath: dalvik.jar,
|
||||||
com.ibm.wala.core;bundle-version="1.1.3",
|
lib/commons-cli-1.2.jar,
|
||||||
com.ibm.wala.ide;bundle-version="1.1.3",
|
lib/commons-io-2.4.jar,
|
||||||
com.ibm.wala.shrike;bundle-version="1.3.1"
|
lib/commons-lang3-3.1.jar,
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
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
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,12 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: SCanDroid
|
Bundle-Name: SCanDroid
|
||||||
Bundle-SymbolicName: com.ibm.wala.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-Activator: com.ibm.wala.scandroid.Activator
|
||||||
Bundle-Vendor: IBM
|
Bundle-Vendor: IBM
|
||||||
Require-Bundle: org.eclipse.ui,
|
Require-Bundle: org.eclipse.ui,
|
||||||
org.eclipse.core.runtime,
|
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.core;bundle-version="1.3.4",
|
||||||
com.ibm.wala.shrike;bundle-version="1.3.4"
|
com.ibm.wala.shrike;bundle-version="1.3.4"
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||||
|
|
|
@ -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>
|
|
@ -137,7 +137,7 @@ public class AndroidAnalysisContext {
|
||||||
ClassHierarchyException, URISyntaxException {
|
ClassHierarchyException, URISyntaxException {
|
||||||
logger.debug(DefaultSCanDroidOptions.dumpString(options));
|
logger.debug(DefaultSCanDroidOptions.dumpString(options));
|
||||||
this.options = options;
|
this.options = options;
|
||||||
scope = AndroidAnalysisScope.setUpAndroidAnalysisScope(options.getAndroidLibrary(), options.getClasspath(), exclusions);
|
scope = AndroidAnalysisScope.setUpAndroidAnalysisScope(options.getClasspath(), exclusions, options.getAndroidLibrary());
|
||||||
|
|
||||||
cha = ClassHierarchy.make(scope);
|
cha = ClassHierarchy.make(scope);
|
||||||
|
|
||||||
|
|
1
pom.xml
1
pom.xml
|
@ -50,6 +50,7 @@
|
||||||
<module>com.ibm.wala.ide.jdt.test</module>
|
<module>com.ibm.wala.ide.jdt.test</module>
|
||||||
|
|
||||||
<module>com.ibm.wala.dalvik</module>
|
<module>com.ibm.wala.dalvik</module>
|
||||||
|
<module>com.ibm.wala.scandroid</module>
|
||||||
|
|
||||||
<module>com.ibm.wala-repository</module>
|
<module>com.ibm.wala-repository</module>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue