diff --git a/api/build.gradle.kts b/api/build.gradle.kts deleted file mode 100644 index a42021f8..00000000 --- a/api/build.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -plugins { - id("java-library") -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -dependencies { - compileOnly("androidx.annotation:annotation:1.5.0") -} diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 42bd5a29..b5d6f58e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -61,5 +61,5 @@ dependencies { implementation(projects.hiddenapi.bridge) implementation(projects.services.daemonService) implementation(projects.services.managerService) - implementation(projects.api) + implementation(projects.libxposed.api) } diff --git a/libxposed/.idea/.gitignore b/libxposed/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/libxposed/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/libxposed/.idea/compiler.xml b/libxposed/.idea/compiler.xml new file mode 100644 index 00000000..fb7f4a8a --- /dev/null +++ b/libxposed/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/libxposed/.idea/gradle.xml b/libxposed/.idea/gradle.xml new file mode 100644 index 00000000..b8fed381 --- /dev/null +++ b/libxposed/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/libxposed/.idea/jarRepositories.xml b/libxposed/.idea/jarRepositories.xml new file mode 100644 index 00000000..d2ce72d1 --- /dev/null +++ b/libxposed/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/libxposed/.idea/misc.xml b/libxposed/.idea/misc.xml new file mode 100644 index 00000000..b1f8730f --- /dev/null +++ b/libxposed/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/libxposed/.idea/vcs.xml b/libxposed/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/libxposed/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/api/.gitignore b/libxposed/api/.gitignore similarity index 100% rename from api/.gitignore rename to libxposed/api/.gitignore diff --git a/libxposed/api/build.gradle.kts b/libxposed/api/build.gradle.kts new file mode 100644 index 00000000..2971c2d1 --- /dev/null +++ b/libxposed/api/build.gradle.kts @@ -0,0 +1,8 @@ +plugins { + `java-library` +} + +dependencies { + compileOnly("androidx.annotation:annotation:1.5.0") + compileOnly(project(":stubs")) +} diff --git a/api/src/main/java/io/github/libxposed/XposedContext.java b/libxposed/api/src/main/java/io/github/libxposed/XposedContext.java similarity index 100% rename from api/src/main/java/io/github/libxposed/XposedContext.java rename to libxposed/api/src/main/java/io/github/libxposed/XposedContext.java diff --git a/api/src/main/java/io/github/libxposed/XposedContextWrapper.java b/libxposed/api/src/main/java/io/github/libxposed/XposedContextWrapper.java similarity index 100% rename from api/src/main/java/io/github/libxposed/XposedContextWrapper.java rename to libxposed/api/src/main/java/io/github/libxposed/XposedContextWrapper.java diff --git a/api/src/main/java/io/github/libxposed/XposedInterface.java b/libxposed/api/src/main/java/io/github/libxposed/XposedInterface.java similarity index 100% rename from api/src/main/java/io/github/libxposed/XposedInterface.java rename to libxposed/api/src/main/java/io/github/libxposed/XposedInterface.java diff --git a/api/src/main/java/io/github/libxposed/XposedModule.java b/libxposed/api/src/main/java/io/github/libxposed/XposedModule.java similarity index 100% rename from api/src/main/java/io/github/libxposed/XposedModule.java rename to libxposed/api/src/main/java/io/github/libxposed/XposedModule.java diff --git a/api/src/main/java/io/github/libxposed/XposedModuleInterface.java b/libxposed/api/src/main/java/io/github/libxposed/XposedModuleInterface.java similarity index 100% rename from api/src/main/java/io/github/libxposed/XposedModuleInterface.java rename to libxposed/api/src/main/java/io/github/libxposed/XposedModuleInterface.java diff --git a/api/src/main/java/io/github/libxposed/XposedResources.java b/libxposed/api/src/main/java/io/github/libxposed/XposedResources.java similarity index 100% rename from api/src/main/java/io/github/libxposed/XposedResources.java rename to libxposed/api/src/main/java/io/github/libxposed/XposedResources.java diff --git a/api/src/main/java/io/github/libxposed/XposedTypedArray.java b/libxposed/api/src/main/java/io/github/libxposed/XposedTypedArray.java similarity index 100% rename from api/src/main/java/io/github/libxposed/XposedTypedArray.java rename to libxposed/api/src/main/java/io/github/libxposed/XposedTypedArray.java diff --git a/api/src/main/java/io/github/libxposed/XposedUtils.java b/libxposed/api/src/main/java/io/github/libxposed/XposedUtils.java similarity index 100% rename from api/src/main/java/io/github/libxposed/XposedUtils.java rename to libxposed/api/src/main/java/io/github/libxposed/XposedUtils.java diff --git a/libxposed/build.gradle b/libxposed/build.gradle new file mode 100644 index 00000000..9d542183 --- /dev/null +++ b/libxposed/build.gradle @@ -0,0 +1,7 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +subprojects { + repositories { + mavenCentral() + google() + } +} diff --git a/libxposed/gradle/wrapper/gradle-wrapper.jar b/libxposed/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..41d9927a Binary files /dev/null and b/libxposed/gradle/wrapper/gradle-wrapper.jar differ diff --git a/libxposed/gradle/wrapper/gradle-wrapper.properties b/libxposed/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..070cb702 --- /dev/null +++ b/libxposed/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/libxposed/gradlew b/libxposed/gradlew new file mode 100644 index 00000000..1b6c7873 --- /dev/null +++ b/libxposed/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/libxposed/gradlew.bat b/libxposed/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/libxposed/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libxposed/local.properties b/libxposed/local.properties new file mode 100644 index 00000000..7cfe5a40 --- /dev/null +++ b/libxposed/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Mon Jan 02 18:11:31 CST 2023 +sdk.dir=D\:\\Android\\SDK diff --git a/libxposed/settings.gradle.kts b/libxposed/settings.gradle.kts new file mode 100644 index 00000000..4455e8a6 --- /dev/null +++ b/libxposed/settings.gradle.kts @@ -0,0 +1,6 @@ +rootProject.name = "libxposed" + +include( + ":api", + ":stubs", +) diff --git a/libxposed/stubs/build.gradle.kts b/libxposed/stubs/build.gradle.kts new file mode 100644 index 00000000..f6727627 --- /dev/null +++ b/libxposed/stubs/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + `java-library` +} diff --git a/api/src/main/java/android/content/Context.java b/libxposed/stubs/src/main/java/android/content/Context.java similarity index 100% rename from api/src/main/java/android/content/Context.java rename to libxposed/stubs/src/main/java/android/content/Context.java diff --git a/api/src/main/java/android/content/ContextWrapper.java b/libxposed/stubs/src/main/java/android/content/ContextWrapper.java similarity index 100% rename from api/src/main/java/android/content/ContextWrapper.java rename to libxposed/stubs/src/main/java/android/content/ContextWrapper.java diff --git a/api/src/main/java/android/content/pm/ApplicationInfo.java b/libxposed/stubs/src/main/java/android/content/pm/ApplicationInfo.java similarity index 100% rename from api/src/main/java/android/content/pm/ApplicationInfo.java rename to libxposed/stubs/src/main/java/android/content/pm/ApplicationInfo.java diff --git a/api/src/main/java/android/content/res/AssetManager.java b/libxposed/stubs/src/main/java/android/content/res/AssetManager.java similarity index 100% rename from api/src/main/java/android/content/res/AssetManager.java rename to libxposed/stubs/src/main/java/android/content/res/AssetManager.java diff --git a/api/src/main/java/android/content/res/Configuration.java b/libxposed/stubs/src/main/java/android/content/res/Configuration.java similarity index 100% rename from api/src/main/java/android/content/res/Configuration.java rename to libxposed/stubs/src/main/java/android/content/res/Configuration.java diff --git a/api/src/main/java/android/content/res/Resources.java b/libxposed/stubs/src/main/java/android/content/res/Resources.java similarity index 100% rename from api/src/main/java/android/content/res/Resources.java rename to libxposed/stubs/src/main/java/android/content/res/Resources.java diff --git a/api/src/main/java/android/content/res/TypedArray.java b/libxposed/stubs/src/main/java/android/content/res/TypedArray.java similarity index 100% rename from api/src/main/java/android/content/res/TypedArray.java rename to libxposed/stubs/src/main/java/android/content/res/TypedArray.java diff --git a/api/src/main/java/android/os/Bundle.java b/libxposed/stubs/src/main/java/android/os/Bundle.java similarity index 100% rename from api/src/main/java/android/os/Bundle.java rename to libxposed/stubs/src/main/java/android/os/Bundle.java diff --git a/api/src/main/java/android/util/DisplayMetrics.java b/libxposed/stubs/src/main/java/android/util/DisplayMetrics.java similarity index 100% rename from api/src/main/java/android/util/DisplayMetrics.java rename to libxposed/stubs/src/main/java/android/util/DisplayMetrics.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 6fae2fae..2fce9a22 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,7 +30,8 @@ dependencyResolutionManagement { rootProject.name = "LSPosed" include( ":app", - ":api", + ":libxposed:api", + ":stubs", ":core", ":daemon", ":dex2oat", @@ -41,3 +42,5 @@ include( ":services:daemon-service", ":services:xposed-service:interface", ) + +project(":stubs").projectDir = file("libxposed/stubs")