diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index f476ad23..031261e5 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -52,6 +52,21 @@ jobs: with: key: ${{ runner.os }} restore-keys: ${{ runner.os }} + - name: Build dependencies + run: | + mkdir -p libxposed + cd libxposed + git clone https://github.com/libxposed/api.git + cd api + ./gradlew :api:publishApiPublicationToMavenLocal + cd .. + git clone https://github.com/libxposed/service.git + cd service + ./gradlew :interface:publishApiPublicationToMavenLocal + cd ../.. + env: + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.maven_pgp_signingKey }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.maven_pgp_signingPassword }} - name: Build with Gradle run: | [ $(du -s ~/.gradle/wrapper | awk '{ print $1 }') -gt 250000 ] && rm -rf ~/.gradle/wrapper/* || true diff --git a/.gitmodules b/.gitmodules index e30bf7b6..9dc2c725 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "services/xposed-service"] - path = services/xposed-service - url = https://github.com/libxposed/XposedService.git [submodule "external/cxx"] path = external/cxx url = https://github.com/LSPosed/libcxx.git diff --git a/core/build.gradle.kts b/core/build.gradle.kts index e2f0b442..85f92534 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -55,6 +55,7 @@ copy { } dependencies { + api("io.github.libxposed:api:100") implementation("org.apache.commons:commons-lang3:3.12.0") implementation("de.upb.cs.swt:axml:2.1.3") compileOnly("androidx.annotation:annotation:1.5.0") @@ -62,5 +63,4 @@ dependencies { implementation(projects.hiddenapi.bridge) implementation(projects.services.daemonService) implementation(projects.services.managerService) - api(projects.libxposed.api) } diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts index 96fe4294..c9e7e3c2 100644 --- a/daemon/build.gradle.kts +++ b/daemon/build.gradle.kts @@ -122,12 +122,12 @@ afterEvaluate { } dependencies { + implementation("io.github.libxposed:service-interface:100") implementation("com.android.tools.build:apksig:$agpVersion") implementation("org.apache.commons:commons-lang3:3.12.0") compileOnly("androidx.annotation:annotation:1.5.0") compileOnly(projects.hiddenapi.stubs) implementation(projects.hiddenapi.bridge) - implementation(projects.libxposed.service) implementation(projects.services.daemonService) implementation(projects.services.managerService) } diff --git a/libxposed/.gitignore b/libxposed/.gitignore deleted file mode 100644 index 2ec908f3..00000000 --- a/libxposed/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*.iml -.DS_Store -.gradle -/.idea -/captures -/local.properties -build diff --git a/libxposed/api/build.gradle.kts b/libxposed/api/build.gradle.kts deleted file mode 100644 index 0802224d..00000000 --- a/libxposed/api/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id("com.android.library") -} - -android { - namespace = "io.github.libxposed" -} - -dependencies { - compileOnly("androidx.annotation:annotation:1.5.0") -} diff --git a/libxposed/api/src/main/AndroidManifest.xml b/libxposed/api/src/main/AndroidManifest.xml deleted file mode 100644 index 5c3d3655..00000000 --- a/libxposed/api/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/libxposed/api/src/main/java/io/github/libxposed/XposedContext.java b/libxposed/api/src/main/java/io/github/libxposed/XposedContext.java deleted file mode 100644 index 7465c0f5..00000000 --- a/libxposed/api/src/main/java/io/github/libxposed/XposedContext.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.github.libxposed; - -import android.content.Context; - -public abstract class XposedContext extends Context implements XposedInterface { - -} diff --git a/libxposed/api/src/main/java/io/github/libxposed/XposedContextWrapper.java b/libxposed/api/src/main/java/io/github/libxposed/XposedContextWrapper.java deleted file mode 100644 index 46b13c4a..00000000 --- a/libxposed/api/src/main/java/io/github/libxposed/XposedContextWrapper.java +++ /dev/null @@ -1,156 +0,0 @@ -package io.github.libxposed; - -import android.content.Context; -import android.content.ContextWrapper; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.nio.ByteBuffer; - -import io.github.libxposed.utils.DexParser; - -public class XposedContextWrapper extends ContextWrapper implements XposedInterface { - - XposedContextWrapper(XposedContext base) { - super(base); - } - - public XposedContextWrapper(XposedContextWrapper base) { - super(base); - } - - final public int getAPIVersion() { - return API; - } - - @Override - final public XposedContext getBaseContext() { - return (XposedContext) super.getBaseContext(); - } - - @NonNull - @Override - final public String getFrameworkName() { - return getBaseContext().getFrameworkName(); - } - - @NonNull - @Override - final public String getFrameworkVersion() { - return getBaseContext().getFrameworkVersion(); - } - - @Override - final public long getFrameworkVersionCode() { - return getBaseContext().getFrameworkVersionCode(); - } - - @Override - final public int getFrameworkPrivilege() { - return getBaseContext().getFrameworkPrivilege(); - } - - @Override - final public Object featuredMethod(String name, Object... args) { - return getBaseContext().featuredMethod(name, args); - } - - @Override - final public MethodUnhooker, Method> hookBefore(@NonNull Method origin, @NonNull BeforeHooker hooker) { - return getBaseContext().hookBefore(origin, hooker); - } - - @Override - final public MethodUnhooker, Method> hookAfter(@NonNull Method origin, @NonNull AfterHooker hooker) { - return getBaseContext().hookAfter(origin, hooker); - } - - @Override - final public MethodUnhooker, Method> hook(@NonNull Method origin, @NonNull Hooker hooker) { - return getBaseContext().hook(origin, hooker); - } - - @Override - final public MethodUnhooker, Method> hookBefore(@NonNull Method origin, int priority, @NonNull BeforeHooker hooker) { - return getBaseContext().hookBefore(origin, priority, hooker); - } - - @Override - final public MethodUnhooker, Method> hookAfter(@NonNull Method origin, int priority, @NonNull AfterHooker hooker) { - return getBaseContext().hookAfter(origin, priority, hooker); - } - - @Override - final public MethodUnhooker, Method> hook(@NonNull Method origin, int priority, @NonNull Hooker hooker) { - return getBaseContext().hook(origin, priority, hooker); - } - - @Override - final public MethodUnhooker>, Constructor> hookBefore(@NonNull Constructor origin, @NonNull BeforeHooker> hooker) { - return getBaseContext().hookBefore(origin, hooker); - } - - @Override - final public MethodUnhooker>, Constructor> hookAfter(@NonNull Constructor origin, @NonNull AfterHooker> hooker) { - return getBaseContext().hookAfter(origin, hooker); - } - - @Override - final public MethodUnhooker>, Constructor> hook(@NonNull Constructor origin, @NonNull Hooker> hooker) { - return getBaseContext().hook(origin, hooker); - } - - @Override - final public MethodUnhooker>, Constructor> hookBefore(@NonNull Constructor origin, int priority, @NonNull BeforeHooker> hooker) { - return getBaseContext().hookBefore(origin, priority, hooker); - } - - @Override - final public MethodUnhooker>, Constructor> hookAfter(@NonNull Constructor origin, int priority, @NonNull AfterHooker> hooker) { - return getBaseContext().hookAfter(origin, priority, hooker); - } - - @Override - final public MethodUnhooker>, Constructor> hook(@NonNull Constructor origin, int priority, @NonNull Hooker> hooker) { - return getBaseContext().hook(origin, priority, hooker); - } - - @Override - final public boolean deoptimize(@NonNull Method method) { - return getBaseContext().deoptimize(method); - } - - @Override - final public boolean deoptimize(@NonNull Constructor constructor) { - return getBaseContext().deoptimize(constructor); - } - - @Override - final public void log(@NonNull String message) { - getBaseContext().log(message); - } - - @Override - final public void log(@NonNull String message, @NonNull Throwable throwable) { - getBaseContext().log(message, throwable); - } - - @Nullable - @Override - final public DexParser parseDex(@NonNull ByteBuffer dexData, boolean includeAnnotations) throws IOException { - return getBaseContext().parseDex(dexData, includeAnnotations); - } - - @Override - final protected void attachBaseContext(Context base) { - if (base instanceof XposedContext || base instanceof XposedContextWrapper) { - super.attachBaseContext(base); - } else { - throw new IllegalArgumentException(); - } - } -} diff --git a/libxposed/api/src/main/java/io/github/libxposed/XposedInterface.java b/libxposed/api/src/main/java/io/github/libxposed/XposedInterface.java deleted file mode 100644 index 9a0269bc..00000000 --- a/libxposed/api/src/main/java/io/github/libxposed/XposedInterface.java +++ /dev/null @@ -1,162 +0,0 @@ -package io.github.libxposed; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.nio.ByteBuffer; -import java.util.ConcurrentModificationException; - -import io.github.libxposed.utils.DexParser; - -public interface XposedInterface { - int API = 100; - - int FRAMEWORK_PRIVILEGE_ROOT = 0; - int FRAMEWORK_PRIVILEGE_CONTAINER = 1; - int FRAMEWORK_PRIVILEGE_APP = 2; - int FRAMEWORK_PRIVILEGE_EMBEDDED = 3; - - interface BeforeHookCallback { - @NonNull - T getOrigin(); - - @Nullable - Object getThis(); - - @NonNull - Object[] getArgs(); - - @Nullable - U getArg(int index); - - void setArg(int index, U value); - - void returnAndSkip(@Nullable Object returnValue); - - void throwAndSkip(@Nullable Throwable throwable); - - @Nullable - Object invokeOrigin(@Nullable Object thisObject, Object[] args) throws InvocationTargetException, IllegalAccessException; - - @Nullable - Object invokeOrigin() throws InvocationTargetException, IllegalAccessException; - - void setExtra(@NonNull String key, @Nullable U value) throws ConcurrentModificationException; - } - - interface AfterHookCallback { - @NonNull - T getOrigin(); - - @Nullable - Object getThis(); - - @NonNull - Object[] getArgs(); - - @Nullable - Object getResult(); - - @Nullable - Throwable getThrowable(); - - boolean isSkipped(); - - void setResult(@Nullable Object result); - - void setThrowable(@Nullable Throwable throwable); - - @Nullable - Object invokeOrigin(@Nullable Object thisObject, Object[] args) throws InvocationTargetException, IllegalAccessException; - - @Nullable - Object invokeOrigin() throws InvocationTargetException, IllegalAccessException; - - @Nullable - U getExtra(@NonNull String key); - } - - interface BeforeHooker { - void before(@NonNull BeforeHookCallback callback); - } - - interface AfterHooker { - void after(@NonNull AfterHookCallback callback); - } - - interface Hooker extends BeforeHooker, AfterHooker { - } - - interface MethodUnhooker { - @NonNull - U getOrigin(); - - @NonNull - T getHooker(); - - void unhook(); - } - - @NonNull - String getFrameworkName(); - - @NonNull - String getFrameworkVersion(); - - long getFrameworkVersionCode(); - - int getFrameworkPrivilege(); - - Object featuredMethod(String name, Object... args); - - @Nullable - MethodUnhooker, Method> hookBefore(@NonNull Method origin, @NonNull BeforeHooker hooker); - - @Nullable - MethodUnhooker, Method> hookAfter(@NonNull Method origin, @NonNull AfterHooker hooker); - - @Nullable - MethodUnhooker, Method> hook(@NonNull Method origin, @NonNull Hooker hooker); - - @Nullable - MethodUnhooker, Method> hookBefore(@NonNull Method origin, int priority, @NonNull BeforeHooker hooker); - - @Nullable - MethodUnhooker, Method> hookAfter(@NonNull Method origin, int priority, @NonNull AfterHooker hooker); - - @Nullable - MethodUnhooker, Method> hook(@NonNull Method origin, int priority, @NonNull Hooker hooker); - - @Nullable - MethodUnhooker>, Constructor> hookBefore(@NonNull Constructor origin, @NonNull BeforeHooker> hooker); - - @Nullable - MethodUnhooker>, Constructor> hookAfter(@NonNull Constructor origin, @NonNull AfterHooker> hooker); - - @Nullable - MethodUnhooker>, Constructor> hook(@NonNull Constructor origin, @NonNull Hooker> hooker); - - @Nullable - MethodUnhooker>, Constructor> hookBefore(@NonNull Constructor origin, int priority, @NonNull BeforeHooker> hooker); - - @Nullable - MethodUnhooker>, Constructor> hookAfter(@NonNull Constructor origin, int priority, @NonNull AfterHooker> hooker); - - @Nullable - MethodUnhooker>, Constructor> hook(@NonNull Constructor origin, int priority, @NonNull Hooker> hooker); - - boolean deoptimize(@NonNull Method method); - - boolean deoptimize(@NonNull Constructor constructor); - - void log(@NonNull String message); - - void log(@NonNull String message, @NonNull Throwable throwable); - - @Nullable - DexParser parseDex(@NonNull ByteBuffer dexData, boolean includeAnnotations) throws IOException; -} diff --git a/libxposed/api/src/main/java/io/github/libxposed/XposedModule.java b/libxposed/api/src/main/java/io/github/libxposed/XposedModule.java deleted file mode 100644 index e0ba296f..00000000 --- a/libxposed/api/src/main/java/io/github/libxposed/XposedModule.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.github.libxposed; - -import androidx.annotation.NonNull; - -public abstract class XposedModule extends XposedContextWrapper implements XposedModuleInterface { - public XposedModule(XposedContext base, @SuppressWarnings("unused") @NonNull ModuleLoadedParam param) { - super(base); - } - - @Override - public void onPackageLoaded(@NonNull PackageLoadedParam param) { - - } -} diff --git a/libxposed/api/src/main/java/io/github/libxposed/XposedModuleInterface.java b/libxposed/api/src/main/java/io/github/libxposed/XposedModuleInterface.java deleted file mode 100644 index 373f0b10..00000000 --- a/libxposed/api/src/main/java/io/github/libxposed/XposedModuleInterface.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.github.libxposed; - -import android.content.pm.ApplicationInfo; -import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -@SuppressWarnings("unused") -public interface XposedModuleInterface { - interface ModuleLoadedParam { - boolean isSystemServer(); - - @NonNull - String getProcessName(); - - @NonNull - String getAppDataDir(); - - @Nullable - Bundle getExtras(); - } - - interface PackageLoadedParam { - @NonNull - String getPackageName(); - - @NonNull - ApplicationInfo getAppInfo(); - - @NonNull - ClassLoader getClassLoader(); - - @NonNull - String getProcessName(); - - boolean isFirstApplication(); - - @Nullable - Bundle getExtras(); - } - - void onPackageLoaded(@NonNull PackageLoadedParam param); -} diff --git a/libxposed/api/src/main/java/io/github/libxposed/utils/DexParser.java b/libxposed/api/src/main/java/io/github/libxposed/utils/DexParser.java deleted file mode 100644 index 22745082..00000000 --- a/libxposed/api/src/main/java/io/github/libxposed/utils/DexParser.java +++ /dev/null @@ -1,133 +0,0 @@ -package io.github.libxposed.utils; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import java.io.Closeable; - -public interface DexParser extends Closeable { - int NO_INDEX = 0xffffffff; - - interface Array { - @NonNull - Value[] getValues(); - } - - interface Annotation { - int getVisibility(); - - @NonNull - TypeId getType(); - - @NonNull - Element[] getElements(); - } - - interface Value { - - @Nullable - byte[] getValue(); - - int getValueType(); - } - - interface Element extends Value { - @NonNull - StringId getName(); - } - - interface TypeId { - @NonNull - StringId getDescriptor(); - } - - interface Id { - int getId(); - } - - interface StringId extends Id { - @NonNull - String getString(); - } - - interface FieldId extends Id { - @NonNull - TypeId getType(); - - @NonNull - TypeId getDeclaringClass(); - - @NonNull - StringId getName(); - } - - interface MethodId extends Id { - @NonNull - TypeId getDeclaringClass(); - - @NonNull - ProtoId getPrototype(); - - @NonNull - StringId getName(); - } - - interface ProtoId extends Id { - @NonNull - StringId getShorty(); - - @NonNull - TypeId getReturnType(); - - @Nullable - TypeId[] getParameters(); - } - - @NonNull - StringId[] getStringId(); - - @NonNull - TypeId[] getTypeId(); - - @NonNull - FieldId[] getFieldId(); - - @NonNull - MethodId[] getMethodId(); - - @NonNull - ProtoId[] getProtoId(); - - @NonNull - Annotation[] getAnnotations(); - - @NonNull - Array[] getArrays(); - - interface EarlyStopVisitor { - boolean stop(); - } - - interface MemberVisitor extends EarlyStopVisitor { - } - - interface ClassVisitor extends EarlyStopVisitor { - @Nullable - MemberVisitor visit(int clazz, int accessFlags, int superClass, @NonNull int[] interfaces, int sourceFile, @NonNull int[] staticFields, @NonNull int[] staticFieldsAccessFlags, @NonNull int[] instanceFields, @NonNull int[] instanceFieldsAccessFlags, @NonNull int[] directMethods, @NonNull int[] directMethodsAccessFlags, @NonNull int[] virtualMethods, @NonNull int[] virtualMethodsAccessFlags, @NonNull int[] annotations); - } - - interface FieldVisitor extends MemberVisitor { - void visit(int field, int accessFlags, @NonNull int[] annotations); - } - - interface MethodVisitor extends MemberVisitor { - @Nullable - MethodBodyVisitor visit(int method, int accessFlags, boolean hasBody, @NonNull int[] annotations, @NonNull int[] parameterAnnotations); - } - - interface MethodBodyVisitor { - void visit(int method, int accessFlags, @NonNull int[] referredStrings, @NonNull int[] invokedMethods, @NonNull int[] accessedFields, @NonNull int[] assignedFields, @NonNull byte[] opcodes); - } - - void visitDefinedClasses(@NonNull ClassVisitor visitor) throws IllegalStateException; -} diff --git a/libxposed/build.gradle.kts b/libxposed/build.gradle.kts deleted file mode 100644 index f557e246..00000000 --- a/libxposed/build.gradle.kts +++ /dev/null @@ -1,3 +0,0 @@ -plugins { - id("com.android.library") version "7.3.1" apply false -} diff --git a/libxposed/gradle/wrapper/gradle-wrapper.jar b/libxposed/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 41d9927a..00000000 Binary files a/libxposed/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/libxposed/gradle/wrapper/gradle-wrapper.properties b/libxposed/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 070cb702..00000000 --- a/libxposed/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 1b6c7873..00000000 --- a/libxposed/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/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 deleted file mode 100644 index 107acd32..00000000 --- a/libxposed/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@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 deleted file mode 100644 index 7cfe5a40..00000000 --- a/libxposed/local.properties +++ /dev/null @@ -1,8 +0,0 @@ -## 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/service/build.gradle.kts b/libxposed/service/build.gradle.kts deleted file mode 100644 index 9d8edfc1..00000000 --- a/libxposed/service/build.gradle.kts +++ /dev/null @@ -1,31 +0,0 @@ -plugins { - id("com.android.library") -} - -android { - compileSdk = 33 - buildToolsVersion = "33.0.1" - namespace = "io.github.libxposed.service" - - defaultConfig { - minSdk = 21 - targetSdk = 33 - consumerProguardFiles("proguard-rules.pro") - } - - buildTypes { - release { - isMinifyEnabled = true - } - } - - buildFeatures { - androidResources = false - buildConfig = false - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } -} diff --git a/libxposed/service/src/main/aidl/io/github/libxposed/service/IXposedScopeCallback.aidl b/libxposed/service/src/main/aidl/io/github/libxposed/service/IXposedScopeCallback.aidl deleted file mode 100644 index 6dcf980a..00000000 --- a/libxposed/service/src/main/aidl/io/github/libxposed/service/IXposedScopeCallback.aidl +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.libxposed.service; - -interface IXposedScopeCallback { - oneway void onScopeRequestPrompted(String packageName) = 1; - oneway void onScopeRequestApproved(String packageName) = 2; - oneway void onScopeRequestDenied(String packageName) = 3; - oneway void onScopeRequestTimeout(String packageName) = 4; - oneway void onScopeRequestFailed(String packageName, String message) = 5; -} diff --git a/libxposed/service/src/main/aidl/io/github/libxposed/service/IXposedService.aidl b/libxposed/service/src/main/aidl/io/github/libxposed/service/IXposedService.aidl deleted file mode 100644 index eff604fc..00000000 --- a/libxposed/service/src/main/aidl/io/github/libxposed/service/IXposedService.aidl +++ /dev/null @@ -1,37 +0,0 @@ -package io.github.libxposed.service; -import io.github.libxposed.service.IXposedScopeCallback; - -interface IXposedService { - const int API = 100; - - const int FRAMEWORK_PRIVILEGE_ROOT = 0; - const int FRAMEWORK_PRIVILEGE_CONTAINER = 1; - const int FRAMEWORK_PRIVILEGE_APP = 2; - const int FRAMEWORK_PRIVILEGE_EMBEDDED = 3; - - const String AUTHORITY_SUFFIX = ".XposedService"; - const String SEND_BINDER = "SendBinder"; - - // framework details - int getAPIVersion() = 1; - String getFrameworkName() = 2; - String getFrameworkVersion() = 3; - long getFrameworkVersionCode() = 4; - int getFrameworkPrivilege() = 5; - Bundle featuredMethod(String name, in Bundle args) = 6; - - // scope utilities - List getScope() = 10; - oneway void requestScope(String packageName, IXposedScopeCallback callback) = 11; - String removeScope(String packageName) = 12; - - // remote preference utilities - Bundle requestRemotePreferences(String group) = 20; - void updateRemotePreferences(String group, in Bundle diff) = 21; - void deleteRemotePreferences(String group) = 22; - - // remote file utilities - ParcelFileDescriptor openRemoteFile(String path, int mode) = 30; - boolean deleteRemoteFile(String path) = 31; - String[] listRemoteFiles() = 32; -} diff --git a/libxposed/settings.gradle.kts b/libxposed/settings.gradle.kts deleted file mode 100644 index 8082e95e..00000000 --- a/libxposed/settings.gradle.kts +++ /dev/null @@ -1,5 +0,0 @@ -rootProject.name = "libxposed" - -include( - ":api", -) diff --git a/services/xposed-service b/services/xposed-service deleted file mode 160000 index ff5cd853..00000000 --- a/services/xposed-service +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ff5cd853e166e5290eaa439bd24994e9cb709e4e diff --git a/settings.gradle.kts b/settings.gradle.kts index 4b0a4e95..9ea077fb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,14 +24,13 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + mavenLocal() } } rootProject.name = "LSPosed" include( ":app", - ":libxposed:api", - ":libxposed:service", ":core", ":daemon", ":dex2oat",