dx.filepath property set

rapid7 · Jan 10, 2025 · fd12345 · fd12345
1 parent 8ca4c74
commit fd12345
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/java/androidpayload/app/pom.xml b/java/androidpayload/app/pom.xml
@@ -67,7 +67,7 @@
 						<buildTools>29.0.3</buildTools>
 					</sdk>
 					<proguard>
-						<skip>true</skip>
+						<skip>false</skip>
 						<config>proguard.cfg</config>
 					</proguard>
 				</configuration>
@@ -91,7 +91,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.7</version>
+						<version>1.8</version>
 						<executions>
 							<execution>
 								<phase>package</phase>

diff --git a/java/androidpayload/library/pom.xml b/java/androidpayload/library/pom.xml
@@ -113,10 +113,7 @@
 								</goals>
 								<configuration>
 									<target>
-										<condition property="dx.filename" value="dx.bat">
-											<os family="windows" />
-										</condition>
-										<property name="dx.filename" value="dx" />
+										<property name="dx.filepath" value="build-tools/29.0.3/lib/dx.jar" />
 
 										<echo>Building shell</echo>
 										<delete dir="${project.basedir}/target/dx" />
@@ -131,7 +128,7 @@
 										<exec executable="java" failonerror="true">
 											<arg value="-Xmx1024M" />
 											<arg value="-jar" />
-											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
+											<arg value="${android.sdk.path}/${dx.filepath}" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/shell.jar" />
@@ -149,7 +146,7 @@
 										<exec executable="java" failonerror="true">
 											<arg value="-Xmx1024M" />
 											<arg value="-jar" />
-											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
+											<arg value="${android.sdk.path}/${dx.filepath}" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/metstage.jar" />
@@ -167,7 +164,7 @@
 										<exec executable="java" failonerror="true">
 											<arg value="-Xmx1024M" />
 											<arg value="-jar" />
-											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
+											<arg value="${android.sdk.path}/${dx.filepath}" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/meterpreter.jar" />
@@ -182,7 +179,7 @@
 										<exec executable="java" failonerror="true">
 											<arg value="-Xmx1024M" />
 											<arg value="-jar" />
-											<arg value="${android.sdk.path}/build-tools/29.0.3/lib/dx.jar" />
+											<arg value="${android.sdk.path}/${dx.filepath}" />
 											<arg value="--verbose" />
 											<arg value="--dex" />
 											<arg value="--output=${project.basedir}/../../${deploy.path}/data/android/meterpreter.dex" />

diff --git a/java/version-compatibility-check/android-api/pom.xml b/java/version-compatibility-check/android-api/pom.xml
@@ -32,8 +32,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>