Make android payload buildable on Windows 11

docker/Dockerfile

@@ -40,7 +40,7 @@ RUN wget http://dl.google.com/android/android-sdk_r24-linux.tgz && \
     mv android-sdk-linux /usr/local/android-sdk
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter tools --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter platform-tools --no-ui -a
-RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter build-tools-23.0.0 --no-ui -a
+RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter build-tools-23.0.3 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-10 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-19 --no-ui -a
 RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter android-3 --no-ui -a

java/README.md

@@ -2,7 +2,8 @@
 
 1. Install Maven and Java 1.8, this will depend on your OS
 1. Download the [Android SDK](https://developer.android.com/sdk/index.html)
-1. Install Android SDK Platforms 3, 10 and 19, and update the "Android SDK Tools" and "Android SDK Platform-tools"
+1. Install Android SDK Platforms 3, 10, 19 and 29, and update the "Android SDK Tools" and "Android SDK Platform-tools" (if you does not find android sdk tools, you must uncheck `Hide Obsolete Packages` in Android SDK Manager)
+1. Install Android SDK Build-Tools 23.0.3
 1. Compile the Android and Java Meterpreter, which deploys to the `../metasploit-framework` folder
 ```
 mvn package -Dandroid.sdk.path=/path/to/android-sdk -Dandroid.release=true -P deploy
@@ -43,6 +44,13 @@ make clean
 make android
 ```
 
+## Building on Windows
+
+```powershell
+# Important: Ensure Java 1.8 is used when compiling
+$env:JAVA_HOME="C:\Program Files\Java\jdk-1.8"
+```
+
 ## Building on OSX
 
 ```

java/androidpayload/app/pom.xml

@@ -64,13 +64,23 @@
 					<sdk>
 						<!-- platform or api level (api level 10 = platform 2.3)-->
 						<platform>10</platform>
+						<buildTools>23.0.3</buildTools>
 					</sdk>
 					<proguard>
 						<skip>false</skip>
 						<config>proguard.cfg</config>
 					</proguard>
 				</configuration>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 	<profiles>
@@ -81,7 +91,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.7</version>
+						<version>1.8</version>
 						<executions>
 							<execution>
 								<phase>package</phase>

java/androidpayload/app/proguard.cfg

@@ -1,3 +1,5 @@
+# Preserve all classes from the Java standard library
+-keep class java.lang.** { *; }
 
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Service

java/androidpayload/library/pom.xml

@@ -81,6 +81,7 @@
 					<sdk>
 						<!-- platform or api level (api level 19 = platform 4.4 (kitkat))-->
 						<platform>19</platform>
+						<buildTools>23.0.3</buildTools>
 					</sdk>
 				</configuration>
 			</plugin>
@@ -112,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/23.0.3/lib/dx.jar" />
 
 										<echo>Building shell</echo>
 										<delete dir="${project.basedir}/target/dx" />
@@ -127,7 +125,10 @@
 											<zipfileset src="${com.metasploit:Metasploit-JavaPayload:jar}" includes="javapayload/stage/StreamForwarder.class" />
 											<zipfileset src="${com.metasploit:Metasploit-JavaPayload:jar}" includes="javapayload/stage/Stage.class" />
 										</copy>
-										<exec executable="${android.sdk.path}/platforms/android-3/tools/${dx.filename}" failonerror="true">
+										<exec executable="java" failonerror="true">
+											<arg value="-Xmx1024M" />
+											<arg value="-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" />
@@ -142,7 +143,10 @@
 											</fileset>
 											<zipfileset src="${com.metasploit:Metasploit-JavaPayload:jar}" includes="javapayload/stage/Stage.class" />
 										</copy>
-										<exec executable="${android.sdk.path}/platforms/android-3/tools/${dx.filename}" failonerror="true">
+										<exec executable="java" failonerror="true">
+											<arg value="-Xmx1024M" />
+											<arg value="-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" />
@@ -156,7 +160,11 @@
 												<include name="com/metasploit/meterpreter/**/*.class" />
 											</fileset>
 										</copy>
-										<exec executable="${android.sdk.path}/platforms/android-3/tools/${dx.filename}" failonerror="true">
+
+										<exec executable="java" failonerror="true">
+											<arg value="-Xmx1024M" />
+											<arg value="-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" />
@@ -167,7 +175,11 @@
 										</exec>
 
 										<echo>Building stageless meterpreter</echo>
-										<exec executable="${android.sdk.path}/platforms/android-3/tools/${dx.filename}" failonerror="true">
+
+										<exec executable="java" failonerror="true">
+											<arg value="-Xmx1024M" />
+											<arg value="-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" />

java/meterpreter/meterpreter/pom.xml

@@ -57,7 +57,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.7</version>
+						<version>1.8</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -68,7 +68,7 @@
 									<target>
 										<mkdir dir="${project.basedir}/target/tmp" />
 										<unzip src="${project.basedir}/target/${project.build.finalName}.jar" dest="${project.basedir}/target/tmp" />
-										<touch datetime="01/01/2000 00:00 AM">
+										<touch datetime="01/01/2000 00:00:00 AM" pattern="MM/dd/YYYY hh:mm:ss a">
 											<fileset dir="${project.basedir}/target/tmp" includes="**/*" />
 										</touch>
 										<delete file="${project.basedir}/../../${deploy.path}/data/meterpreter/${project.build.finalName}.jar"/>

java/meterpreter/stdapi/pom.xml

@@ -80,7 +80,7 @@
 									<target>
 										<mkdir dir="${project.basedir}/target/tmp" />
 										<unzip src="${project.basedir}/target/${project.build.finalName}.jar" dest="${project.basedir}/target/tmp" />
-										<touch datetime="01/01/2000 00:00 AM">
+										<touch datetime="01/01/2000 00:00:00 AM" pattern="MM/dd/YYYY hh:mm:ss a">
 											<fileset dir="${project.basedir}/target/tmp" includes="**/*" />
 										</touch>
 										<delete file="${project.basedir}/../../${deploy.path}/data/meterpreter/${project.build.finalName}.jar"/>

java/version-compatibility-check/android-api/pom.xml

@@ -38,7 +38,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
+				<version>1.8</version>
 				<executions>
 					<execution>
 						<id>copy-source</id>