From 6f48c663db94cd8645e1b43bfc0eeb177d6fe296 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Sun, 13 Mar 2022 07:23:04 +0800 Subject: [PATCH] Refactor some gradle (#1752) --- app/build.gradle.kts | 2 +- build.gradle.kts | 5 ----- core/build.gradle.kts | 4 ++-- daemon-service/build.gradle.kts | 3 +-- daemon/build.gradle.kts | 8 +++++--- gradle.properties | 3 +++ gradle/wrapper/gradle-wrapper.properties | 2 +- .../bridge}/.gitignore | 0 .../bridge}/build.gradle.kts | 4 ++-- .../java/hidden/ByteBufferDexClassLoader.java | 0 .../src/main/java/hidden/HiddenApiBridge.java | 0 .../stubs}/.gitignore | 0 .../stubs}/build.gradle.kts | 0 .../stubs}/src/main/AndroidManifest.xml | 0 .../main/java/android/annotation/NonNull.java | 0 .../java/android/annotation/Nullable.java | 0 .../main/java/android/app/ActivityThread.java | 0 .../main/java/android/app/Application.java | 0 .../android/app/ContentProviderHolder.java | 0 .../main/java/android/app/ContextImpl.java | 0 .../java/android/app/IActivityController.java | 0 .../java/android/app/IActivityManager.java | 0 .../java/android/app/IApplicationThread.java | 0 .../android/app/INotificationManager.java | 0 .../java/android/app/IServiceConnection.java | 0 .../src/main/java/android/app/LoadedApk.java | 0 .../main/java/android/app/Notification.java | 0 .../java/android/app/NotificationChannel.java | 0 .../main/java/android/app/ProfilerInfo.java | 0 .../java/android/app/ResourcesManager.java | 0 .../android/content/AttributionSource.java | 0 .../android/content/BroadcastReceiver.java | 0 .../java/android/content/ComponentName.java | 0 .../main/java/android/content/Context.java | 0 .../android/content/IContentProvider.java | 0 .../java/android/content/IIntentReceiver.java | 0 .../java/android/content/IIntentSender.java | 0 .../src/main/java/android/content/Intent.java | 0 .../java/android/content/IntentFilter.java | 0 .../java/android/content/IntentSender.java | 0 .../android/content/pm/ApplicationInfo.java | 0 .../content/pm/BaseParceledListSlice.java | 0 .../android/content/pm/IPackageInstaller.java | 0 .../android/content/pm/IPackageManager.java | 0 .../android/content/pm/IShortcutService.java | 0 .../java/android/content/pm/PackageInfo.java | 0 .../android/content/pm/PackageInstaller.java | 0 .../android/content/pm/PackageManager.java | 0 .../android/content/pm/PackageParser.java | 0 .../android/content/pm/ParceledListSlice.java | 0 .../java/android/content/pm/ResolveInfo.java | 0 .../java/android/content/pm/ShortcutInfo.java | 0 .../java/android/content/pm/UserInfo.java | 0 .../android/content/pm/VersionedPackage.java | 0 .../android/content/res/AssetManager.java | 0 .../content/res/CompatibilityInfo.java | 0 .../android/content/res/Configuration.java | 0 .../java/android/content/res/Resources.java | 0 .../android/content/res/ResourcesImpl.java | 0 .../android/content/res/ResourcesKey.java | 0 .../java/android/content/res/TypedArray.java | 0 .../java/android/ddm/DdmHandleAppName.java | 0 .../src/main/java/android/graphics/Movie.java | 0 .../android/graphics/drawable/Drawable.java | 0 .../src/main/java/android/os/Binder.java | 0 .../src/main/java/android/os/Build.java | 0 .../src/main/java/android/os/Bundle.java | 0 .../src/main/java/android/os/Environment.java | 0 .../src/main/java/android/os/Handler.java | 0 .../src/main/java/android/os/IBinder.java | 0 .../src/main/java/android/os/IInterface.java | 0 .../main/java/android/os/IPowerManager.java | 0 .../java/android/os/IServiceCallback.java | 0 .../main/java/android/os/IServiceManager.java | 0 .../main/java/android/os/IUserManager.java | 0 .../src/main/java/android/os/Parcel.java | 0 .../src/main/java/android/os/Parcelable.java | 0 .../java/android/os/PersistableBundle.java | 0 .../main/java/android/os/RemoteException.java | 0 .../main/java/android/os/ResultReceiver.java | 0 .../src/main/java/android/os/SELinux.java | 0 .../main/java/android/os/ServiceManager.java | 0 .../main/java/android/os/ShellCallback.java | 0 .../main/java/android/os/ShellCommand.java | 0 .../java/android/os/SystemProperties.java | 0 .../src/main/java/android/os/UserHandle.java | 0 .../src/main/java/android/os/UserManager.java | 0 .../java/android/system/ErrnoException.java | 0 .../main/java/android/system/Int32Ref.java | 0 .../src/main/java/android/system/Os.java | 0 .../java/android/util/DisplayMetrics.java | 0 .../main/java/android/util/MutableInt.java | 0 .../main/java/android/util/TypedValue.java | 0 .../java/android/view/IWindowManager.java | 0 .../java/android/webkit/WebViewDelegate.java | 0 .../java/android/webkit/WebViewFactory.java | 0 .../webkit/WebViewFactoryProvider.java | 0 .../java/androidx/annotation/IntRange.java | 0 .../java/androidx/annotation/RequiresApi.java | 0 .../android/internal/os/BinderInternal.java | 0 .../com/android/internal/os/ZygoteInit.java | 0 .../com/android/internal/util/XmlUtils.java | 0 .../com/android/server/LocalServices.java | 0 .../com/android/server/SystemService.java | 0 .../android/server/SystemServiceManager.java | 0 .../server/am/ActivityManagerService.java | 0 .../com/android/server/am/ProcessRecord.java | 0 .../dalvik/system/BaseDexClassLoader.java | 0 .../main/java/dalvik/system/VMRuntime.java | 0 .../xmlpull/v1/XmlPullParserException.java | 0 .../src/main/java/sun/net/www/ParseUtil.java | 0 .../xposed/dummy/XResourcesSuperClass.java | 0 .../xposed/dummy/XTypedArraySuperClass.java | 0 settings.gradle.kts | 20 +++++++++++++++++-- 114 files changed, 33 insertions(+), 18 deletions(-) rename {hiddenapi-bridge => hiddenapi/bridge}/.gitignore (100%) rename {hiddenapi-bridge => hiddenapi/bridge}/build.gradle.kts (94%) rename {hiddenapi-bridge => hiddenapi/bridge}/src/main/java/hidden/ByteBufferDexClassLoader.java (100%) rename {hiddenapi-bridge => hiddenapi/bridge}/src/main/java/hidden/HiddenApiBridge.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/.gitignore (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/build.gradle.kts (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/AndroidManifest.xml (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/annotation/NonNull.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/annotation/Nullable.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/ActivityThread.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/Application.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/ContentProviderHolder.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/ContextImpl.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/IActivityController.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/IActivityManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/IApplicationThread.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/INotificationManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/IServiceConnection.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/LoadedApk.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/Notification.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/NotificationChannel.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/ProfilerInfo.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/app/ResourcesManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/AttributionSource.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/BroadcastReceiver.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/ComponentName.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/Context.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/IContentProvider.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/IIntentReceiver.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/IIntentSender.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/Intent.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/IntentFilter.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/IntentSender.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/ApplicationInfo.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/BaseParceledListSlice.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/IPackageInstaller.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/IPackageManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/IShortcutService.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/PackageInfo.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/PackageInstaller.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/PackageManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/PackageParser.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/ParceledListSlice.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/ResolveInfo.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/ShortcutInfo.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/UserInfo.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/pm/VersionedPackage.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/res/AssetManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/res/CompatibilityInfo.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/res/Configuration.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/res/Resources.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/res/ResourcesImpl.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/res/ResourcesKey.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/content/res/TypedArray.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/ddm/DdmHandleAppName.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/graphics/Movie.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/graphics/drawable/Drawable.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/Binder.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/Build.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/Bundle.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/Environment.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/Handler.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/IBinder.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/IInterface.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/IPowerManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/IServiceCallback.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/IServiceManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/IUserManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/Parcel.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/Parcelable.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/PersistableBundle.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/RemoteException.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/ResultReceiver.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/SELinux.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/ServiceManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/ShellCallback.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/ShellCommand.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/SystemProperties.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/UserHandle.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/os/UserManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/system/ErrnoException.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/system/Int32Ref.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/system/Os.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/util/DisplayMetrics.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/util/MutableInt.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/util/TypedValue.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/view/IWindowManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/webkit/WebViewDelegate.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/webkit/WebViewFactory.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/android/webkit/WebViewFactoryProvider.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/androidx/annotation/IntRange.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/androidx/annotation/RequiresApi.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/com/android/internal/os/BinderInternal.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/com/android/internal/os/ZygoteInit.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/com/android/internal/util/XmlUtils.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/com/android/server/LocalServices.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/com/android/server/SystemService.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/com/android/server/SystemServiceManager.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/com/android/server/am/ActivityManagerService.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/com/android/server/am/ProcessRecord.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/dalvik/system/BaseDexClassLoader.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/dalvik/system/VMRuntime.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/org/xmlpull/v1/XmlPullParserException.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/sun/net/www/ParseUtil.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/xposed/dummy/XResourcesSuperClass.java (100%) rename {hiddenapi-stubs => hiddenapi/stubs}/src/main/java/xposed/dummy/XTypedArraySuperClass.java (100%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e651bb4e..a1cd342a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -165,7 +165,7 @@ tasks.whenTaskAdded { dependencies { val glideVersion = "4.13.1" - val navVersion: String by rootProject.extra + val navVersion: String by project annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion") implementation("androidx.activity:activity:1.4.0") implementation("androidx.browser:browser:1.4.0") diff --git a/build.gradle.kts b/build.gradle.kts index c67c9405..d71d5f54 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,13 +24,8 @@ buildscript { google() mavenCentral() } - val navVersion by extra("2.5.0-alpha02") - val agpVersion by extra("7.1.2") dependencies { - classpath("com.android.tools.build:gradle:$agpVersion") - classpath("dev.rikka.tools.autoresconfig:gradle-plugin:1.0.0") classpath("org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r") - classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion") } } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 62c84703..46c9f0b4 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -164,8 +164,8 @@ dependencies { implementation("org.apache.commons:commons-lang3:3.12.0") implementation("de.upb.cs.swt:axml:2.1.2") compileOnly("androidx.annotation:annotation:1.3.0") - compileOnly(project(":hiddenapi-stubs")) - implementation(project(":hiddenapi-bridge")) + compileOnly(project(":hiddenapi:stubs")) + implementation(project(":hiddenapi:bridge")) implementation(project(":manager-service")) implementation(project(":daemon-service")) } diff --git a/daemon-service/build.gradle.kts b/daemon-service/build.gradle.kts index fd29274f..cbf41d90 100644 --- a/daemon-service/build.gradle.kts +++ b/daemon-service/build.gradle.kts @@ -53,6 +53,5 @@ android { } dependencies { - - compileOnly(project(":hiddenapi-stubs")) + compileOnly(project(":hiddenapi:stubs")) } diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts index bbf7da18..528e3e11 100644 --- a/daemon/build.gradle.kts +++ b/daemon/build.gradle.kts @@ -24,6 +24,8 @@ import java.util.* plugins { id("com.android.application") + id("androidx.navigation.safeargs") + id("dev.rikka.tools.autoresconfig") } val daemonName = "LSPosed" @@ -31,7 +33,7 @@ val daemonName = "LSPosed" val injectedPackageName: String by rootProject.extra val injectedPackageUid: Int by rootProject.extra -val agpVersion: String by rootProject.extra +val agpVersion : String by project val defaultManagerPackageName: String by rootProject.extra val apiCode: Int by rootProject.extra @@ -167,8 +169,8 @@ dependencies { implementation("com.android.tools.build:apksig:$agpVersion") implementation("org.apache.commons:commons-lang3:3.12.0") compileOnly("androidx.annotation:annotation:1.3.0") - compileOnly(project(":hiddenapi-stubs")) - implementation(project(":hiddenapi-bridge")) + compileOnly(project(":hiddenapi:stubs")) + implementation(project(":hiddenapi:bridge")) implementation(project(":daemon-service")) implementation(project(":manager-service")) } diff --git a/gradle.properties b/gradle.properties index 69af2471..2f28e29f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,3 +17,6 @@ android.enableAppCompileTimeRClass=true android.nonTransitiveRClass=true android.enableR8.fullMode=true android.useAndroidX=true + +agpVersion=7.1.2 +navVersion=2.5.0-alpha03 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897..00e33ede 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hiddenapi-bridge/.gitignore b/hiddenapi/bridge/.gitignore similarity index 100% rename from hiddenapi-bridge/.gitignore rename to hiddenapi/bridge/.gitignore diff --git a/hiddenapi-bridge/build.gradle.kts b/hiddenapi/bridge/build.gradle.kts similarity index 94% rename from hiddenapi-bridge/build.gradle.kts rename to hiddenapi/bridge/build.gradle.kts index fdd01b3c..92d05a6e 100644 --- a/hiddenapi-bridge/build.gradle.kts +++ b/hiddenapi/bridge/build.gradle.kts @@ -22,5 +22,5 @@ plugins { } dependencies { - compileOnly(project(":hiddenapi-stubs")) -} \ No newline at end of file + compileOnly(project(":hiddenapi:stubs")) +} diff --git a/hiddenapi-bridge/src/main/java/hidden/ByteBufferDexClassLoader.java b/hiddenapi/bridge/src/main/java/hidden/ByteBufferDexClassLoader.java similarity index 100% rename from hiddenapi-bridge/src/main/java/hidden/ByteBufferDexClassLoader.java rename to hiddenapi/bridge/src/main/java/hidden/ByteBufferDexClassLoader.java diff --git a/hiddenapi-bridge/src/main/java/hidden/HiddenApiBridge.java b/hiddenapi/bridge/src/main/java/hidden/HiddenApiBridge.java similarity index 100% rename from hiddenapi-bridge/src/main/java/hidden/HiddenApiBridge.java rename to hiddenapi/bridge/src/main/java/hidden/HiddenApiBridge.java diff --git a/hiddenapi-stubs/.gitignore b/hiddenapi/stubs/.gitignore similarity index 100% rename from hiddenapi-stubs/.gitignore rename to hiddenapi/stubs/.gitignore diff --git a/hiddenapi-stubs/build.gradle.kts b/hiddenapi/stubs/build.gradle.kts similarity index 100% rename from hiddenapi-stubs/build.gradle.kts rename to hiddenapi/stubs/build.gradle.kts diff --git a/hiddenapi-stubs/src/main/AndroidManifest.xml b/hiddenapi/stubs/src/main/AndroidManifest.xml similarity index 100% rename from hiddenapi-stubs/src/main/AndroidManifest.xml rename to hiddenapi/stubs/src/main/AndroidManifest.xml diff --git a/hiddenapi-stubs/src/main/java/android/annotation/NonNull.java b/hiddenapi/stubs/src/main/java/android/annotation/NonNull.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/annotation/NonNull.java rename to hiddenapi/stubs/src/main/java/android/annotation/NonNull.java diff --git a/hiddenapi-stubs/src/main/java/android/annotation/Nullable.java b/hiddenapi/stubs/src/main/java/android/annotation/Nullable.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/annotation/Nullable.java rename to hiddenapi/stubs/src/main/java/android/annotation/Nullable.java diff --git a/hiddenapi-stubs/src/main/java/android/app/ActivityThread.java b/hiddenapi/stubs/src/main/java/android/app/ActivityThread.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/ActivityThread.java rename to hiddenapi/stubs/src/main/java/android/app/ActivityThread.java diff --git a/hiddenapi-stubs/src/main/java/android/app/Application.java b/hiddenapi/stubs/src/main/java/android/app/Application.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/Application.java rename to hiddenapi/stubs/src/main/java/android/app/Application.java diff --git a/hiddenapi-stubs/src/main/java/android/app/ContentProviderHolder.java b/hiddenapi/stubs/src/main/java/android/app/ContentProviderHolder.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/ContentProviderHolder.java rename to hiddenapi/stubs/src/main/java/android/app/ContentProviderHolder.java diff --git a/hiddenapi-stubs/src/main/java/android/app/ContextImpl.java b/hiddenapi/stubs/src/main/java/android/app/ContextImpl.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/ContextImpl.java rename to hiddenapi/stubs/src/main/java/android/app/ContextImpl.java diff --git a/hiddenapi-stubs/src/main/java/android/app/IActivityController.java b/hiddenapi/stubs/src/main/java/android/app/IActivityController.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/IActivityController.java rename to hiddenapi/stubs/src/main/java/android/app/IActivityController.java diff --git a/hiddenapi-stubs/src/main/java/android/app/IActivityManager.java b/hiddenapi/stubs/src/main/java/android/app/IActivityManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/IActivityManager.java rename to hiddenapi/stubs/src/main/java/android/app/IActivityManager.java diff --git a/hiddenapi-stubs/src/main/java/android/app/IApplicationThread.java b/hiddenapi/stubs/src/main/java/android/app/IApplicationThread.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/IApplicationThread.java rename to hiddenapi/stubs/src/main/java/android/app/IApplicationThread.java diff --git a/hiddenapi-stubs/src/main/java/android/app/INotificationManager.java b/hiddenapi/stubs/src/main/java/android/app/INotificationManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/INotificationManager.java rename to hiddenapi/stubs/src/main/java/android/app/INotificationManager.java diff --git a/hiddenapi-stubs/src/main/java/android/app/IServiceConnection.java b/hiddenapi/stubs/src/main/java/android/app/IServiceConnection.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/IServiceConnection.java rename to hiddenapi/stubs/src/main/java/android/app/IServiceConnection.java diff --git a/hiddenapi-stubs/src/main/java/android/app/LoadedApk.java b/hiddenapi/stubs/src/main/java/android/app/LoadedApk.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/LoadedApk.java rename to hiddenapi/stubs/src/main/java/android/app/LoadedApk.java diff --git a/hiddenapi-stubs/src/main/java/android/app/Notification.java b/hiddenapi/stubs/src/main/java/android/app/Notification.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/Notification.java rename to hiddenapi/stubs/src/main/java/android/app/Notification.java diff --git a/hiddenapi-stubs/src/main/java/android/app/NotificationChannel.java b/hiddenapi/stubs/src/main/java/android/app/NotificationChannel.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/NotificationChannel.java rename to hiddenapi/stubs/src/main/java/android/app/NotificationChannel.java diff --git a/hiddenapi-stubs/src/main/java/android/app/ProfilerInfo.java b/hiddenapi/stubs/src/main/java/android/app/ProfilerInfo.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/ProfilerInfo.java rename to hiddenapi/stubs/src/main/java/android/app/ProfilerInfo.java diff --git a/hiddenapi-stubs/src/main/java/android/app/ResourcesManager.java b/hiddenapi/stubs/src/main/java/android/app/ResourcesManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/app/ResourcesManager.java rename to hiddenapi/stubs/src/main/java/android/app/ResourcesManager.java diff --git a/hiddenapi-stubs/src/main/java/android/content/AttributionSource.java b/hiddenapi/stubs/src/main/java/android/content/AttributionSource.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/AttributionSource.java rename to hiddenapi/stubs/src/main/java/android/content/AttributionSource.java diff --git a/hiddenapi-stubs/src/main/java/android/content/BroadcastReceiver.java b/hiddenapi/stubs/src/main/java/android/content/BroadcastReceiver.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/BroadcastReceiver.java rename to hiddenapi/stubs/src/main/java/android/content/BroadcastReceiver.java diff --git a/hiddenapi-stubs/src/main/java/android/content/ComponentName.java b/hiddenapi/stubs/src/main/java/android/content/ComponentName.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/ComponentName.java rename to hiddenapi/stubs/src/main/java/android/content/ComponentName.java diff --git a/hiddenapi-stubs/src/main/java/android/content/Context.java b/hiddenapi/stubs/src/main/java/android/content/Context.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/Context.java rename to hiddenapi/stubs/src/main/java/android/content/Context.java diff --git a/hiddenapi-stubs/src/main/java/android/content/IContentProvider.java b/hiddenapi/stubs/src/main/java/android/content/IContentProvider.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/IContentProvider.java rename to hiddenapi/stubs/src/main/java/android/content/IContentProvider.java diff --git a/hiddenapi-stubs/src/main/java/android/content/IIntentReceiver.java b/hiddenapi/stubs/src/main/java/android/content/IIntentReceiver.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/IIntentReceiver.java rename to hiddenapi/stubs/src/main/java/android/content/IIntentReceiver.java diff --git a/hiddenapi-stubs/src/main/java/android/content/IIntentSender.java b/hiddenapi/stubs/src/main/java/android/content/IIntentSender.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/IIntentSender.java rename to hiddenapi/stubs/src/main/java/android/content/IIntentSender.java diff --git a/hiddenapi-stubs/src/main/java/android/content/Intent.java b/hiddenapi/stubs/src/main/java/android/content/Intent.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/Intent.java rename to hiddenapi/stubs/src/main/java/android/content/Intent.java diff --git a/hiddenapi-stubs/src/main/java/android/content/IntentFilter.java b/hiddenapi/stubs/src/main/java/android/content/IntentFilter.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/IntentFilter.java rename to hiddenapi/stubs/src/main/java/android/content/IntentFilter.java diff --git a/hiddenapi-stubs/src/main/java/android/content/IntentSender.java b/hiddenapi/stubs/src/main/java/android/content/IntentSender.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/IntentSender.java rename to hiddenapi/stubs/src/main/java/android/content/IntentSender.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/ApplicationInfo.java b/hiddenapi/stubs/src/main/java/android/content/pm/ApplicationInfo.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/ApplicationInfo.java rename to hiddenapi/stubs/src/main/java/android/content/pm/ApplicationInfo.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/BaseParceledListSlice.java b/hiddenapi/stubs/src/main/java/android/content/pm/BaseParceledListSlice.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/BaseParceledListSlice.java rename to hiddenapi/stubs/src/main/java/android/content/pm/BaseParceledListSlice.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/IPackageInstaller.java b/hiddenapi/stubs/src/main/java/android/content/pm/IPackageInstaller.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/IPackageInstaller.java rename to hiddenapi/stubs/src/main/java/android/content/pm/IPackageInstaller.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/IPackageManager.java b/hiddenapi/stubs/src/main/java/android/content/pm/IPackageManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/IPackageManager.java rename to hiddenapi/stubs/src/main/java/android/content/pm/IPackageManager.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/IShortcutService.java b/hiddenapi/stubs/src/main/java/android/content/pm/IShortcutService.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/IShortcutService.java rename to hiddenapi/stubs/src/main/java/android/content/pm/IShortcutService.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/PackageInfo.java b/hiddenapi/stubs/src/main/java/android/content/pm/PackageInfo.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/PackageInfo.java rename to hiddenapi/stubs/src/main/java/android/content/pm/PackageInfo.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/PackageInstaller.java b/hiddenapi/stubs/src/main/java/android/content/pm/PackageInstaller.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/PackageInstaller.java rename to hiddenapi/stubs/src/main/java/android/content/pm/PackageInstaller.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/PackageManager.java b/hiddenapi/stubs/src/main/java/android/content/pm/PackageManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/PackageManager.java rename to hiddenapi/stubs/src/main/java/android/content/pm/PackageManager.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/PackageParser.java b/hiddenapi/stubs/src/main/java/android/content/pm/PackageParser.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/PackageParser.java rename to hiddenapi/stubs/src/main/java/android/content/pm/PackageParser.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/ParceledListSlice.java b/hiddenapi/stubs/src/main/java/android/content/pm/ParceledListSlice.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/ParceledListSlice.java rename to hiddenapi/stubs/src/main/java/android/content/pm/ParceledListSlice.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/ResolveInfo.java b/hiddenapi/stubs/src/main/java/android/content/pm/ResolveInfo.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/ResolveInfo.java rename to hiddenapi/stubs/src/main/java/android/content/pm/ResolveInfo.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/ShortcutInfo.java b/hiddenapi/stubs/src/main/java/android/content/pm/ShortcutInfo.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/ShortcutInfo.java rename to hiddenapi/stubs/src/main/java/android/content/pm/ShortcutInfo.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/UserInfo.java b/hiddenapi/stubs/src/main/java/android/content/pm/UserInfo.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/UserInfo.java rename to hiddenapi/stubs/src/main/java/android/content/pm/UserInfo.java diff --git a/hiddenapi-stubs/src/main/java/android/content/pm/VersionedPackage.java b/hiddenapi/stubs/src/main/java/android/content/pm/VersionedPackage.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/pm/VersionedPackage.java rename to hiddenapi/stubs/src/main/java/android/content/pm/VersionedPackage.java diff --git a/hiddenapi-stubs/src/main/java/android/content/res/AssetManager.java b/hiddenapi/stubs/src/main/java/android/content/res/AssetManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/res/AssetManager.java rename to hiddenapi/stubs/src/main/java/android/content/res/AssetManager.java diff --git a/hiddenapi-stubs/src/main/java/android/content/res/CompatibilityInfo.java b/hiddenapi/stubs/src/main/java/android/content/res/CompatibilityInfo.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/res/CompatibilityInfo.java rename to hiddenapi/stubs/src/main/java/android/content/res/CompatibilityInfo.java diff --git a/hiddenapi-stubs/src/main/java/android/content/res/Configuration.java b/hiddenapi/stubs/src/main/java/android/content/res/Configuration.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/res/Configuration.java rename to hiddenapi/stubs/src/main/java/android/content/res/Configuration.java diff --git a/hiddenapi-stubs/src/main/java/android/content/res/Resources.java b/hiddenapi/stubs/src/main/java/android/content/res/Resources.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/res/Resources.java rename to hiddenapi/stubs/src/main/java/android/content/res/Resources.java diff --git a/hiddenapi-stubs/src/main/java/android/content/res/ResourcesImpl.java b/hiddenapi/stubs/src/main/java/android/content/res/ResourcesImpl.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/res/ResourcesImpl.java rename to hiddenapi/stubs/src/main/java/android/content/res/ResourcesImpl.java diff --git a/hiddenapi-stubs/src/main/java/android/content/res/ResourcesKey.java b/hiddenapi/stubs/src/main/java/android/content/res/ResourcesKey.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/res/ResourcesKey.java rename to hiddenapi/stubs/src/main/java/android/content/res/ResourcesKey.java diff --git a/hiddenapi-stubs/src/main/java/android/content/res/TypedArray.java b/hiddenapi/stubs/src/main/java/android/content/res/TypedArray.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/content/res/TypedArray.java rename to hiddenapi/stubs/src/main/java/android/content/res/TypedArray.java diff --git a/hiddenapi-stubs/src/main/java/android/ddm/DdmHandleAppName.java b/hiddenapi/stubs/src/main/java/android/ddm/DdmHandleAppName.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/ddm/DdmHandleAppName.java rename to hiddenapi/stubs/src/main/java/android/ddm/DdmHandleAppName.java diff --git a/hiddenapi-stubs/src/main/java/android/graphics/Movie.java b/hiddenapi/stubs/src/main/java/android/graphics/Movie.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/graphics/Movie.java rename to hiddenapi/stubs/src/main/java/android/graphics/Movie.java diff --git a/hiddenapi-stubs/src/main/java/android/graphics/drawable/Drawable.java b/hiddenapi/stubs/src/main/java/android/graphics/drawable/Drawable.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/graphics/drawable/Drawable.java rename to hiddenapi/stubs/src/main/java/android/graphics/drawable/Drawable.java diff --git a/hiddenapi-stubs/src/main/java/android/os/Binder.java b/hiddenapi/stubs/src/main/java/android/os/Binder.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/Binder.java rename to hiddenapi/stubs/src/main/java/android/os/Binder.java diff --git a/hiddenapi-stubs/src/main/java/android/os/Build.java b/hiddenapi/stubs/src/main/java/android/os/Build.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/Build.java rename to hiddenapi/stubs/src/main/java/android/os/Build.java diff --git a/hiddenapi-stubs/src/main/java/android/os/Bundle.java b/hiddenapi/stubs/src/main/java/android/os/Bundle.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/Bundle.java rename to hiddenapi/stubs/src/main/java/android/os/Bundle.java diff --git a/hiddenapi-stubs/src/main/java/android/os/Environment.java b/hiddenapi/stubs/src/main/java/android/os/Environment.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/Environment.java rename to hiddenapi/stubs/src/main/java/android/os/Environment.java diff --git a/hiddenapi-stubs/src/main/java/android/os/Handler.java b/hiddenapi/stubs/src/main/java/android/os/Handler.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/Handler.java rename to hiddenapi/stubs/src/main/java/android/os/Handler.java diff --git a/hiddenapi-stubs/src/main/java/android/os/IBinder.java b/hiddenapi/stubs/src/main/java/android/os/IBinder.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/IBinder.java rename to hiddenapi/stubs/src/main/java/android/os/IBinder.java diff --git a/hiddenapi-stubs/src/main/java/android/os/IInterface.java b/hiddenapi/stubs/src/main/java/android/os/IInterface.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/IInterface.java rename to hiddenapi/stubs/src/main/java/android/os/IInterface.java diff --git a/hiddenapi-stubs/src/main/java/android/os/IPowerManager.java b/hiddenapi/stubs/src/main/java/android/os/IPowerManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/IPowerManager.java rename to hiddenapi/stubs/src/main/java/android/os/IPowerManager.java diff --git a/hiddenapi-stubs/src/main/java/android/os/IServiceCallback.java b/hiddenapi/stubs/src/main/java/android/os/IServiceCallback.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/IServiceCallback.java rename to hiddenapi/stubs/src/main/java/android/os/IServiceCallback.java diff --git a/hiddenapi-stubs/src/main/java/android/os/IServiceManager.java b/hiddenapi/stubs/src/main/java/android/os/IServiceManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/IServiceManager.java rename to hiddenapi/stubs/src/main/java/android/os/IServiceManager.java diff --git a/hiddenapi-stubs/src/main/java/android/os/IUserManager.java b/hiddenapi/stubs/src/main/java/android/os/IUserManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/IUserManager.java rename to hiddenapi/stubs/src/main/java/android/os/IUserManager.java diff --git a/hiddenapi-stubs/src/main/java/android/os/Parcel.java b/hiddenapi/stubs/src/main/java/android/os/Parcel.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/Parcel.java rename to hiddenapi/stubs/src/main/java/android/os/Parcel.java diff --git a/hiddenapi-stubs/src/main/java/android/os/Parcelable.java b/hiddenapi/stubs/src/main/java/android/os/Parcelable.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/Parcelable.java rename to hiddenapi/stubs/src/main/java/android/os/Parcelable.java diff --git a/hiddenapi-stubs/src/main/java/android/os/PersistableBundle.java b/hiddenapi/stubs/src/main/java/android/os/PersistableBundle.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/PersistableBundle.java rename to hiddenapi/stubs/src/main/java/android/os/PersistableBundle.java diff --git a/hiddenapi-stubs/src/main/java/android/os/RemoteException.java b/hiddenapi/stubs/src/main/java/android/os/RemoteException.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/RemoteException.java rename to hiddenapi/stubs/src/main/java/android/os/RemoteException.java diff --git a/hiddenapi-stubs/src/main/java/android/os/ResultReceiver.java b/hiddenapi/stubs/src/main/java/android/os/ResultReceiver.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/ResultReceiver.java rename to hiddenapi/stubs/src/main/java/android/os/ResultReceiver.java diff --git a/hiddenapi-stubs/src/main/java/android/os/SELinux.java b/hiddenapi/stubs/src/main/java/android/os/SELinux.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/SELinux.java rename to hiddenapi/stubs/src/main/java/android/os/SELinux.java diff --git a/hiddenapi-stubs/src/main/java/android/os/ServiceManager.java b/hiddenapi/stubs/src/main/java/android/os/ServiceManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/ServiceManager.java rename to hiddenapi/stubs/src/main/java/android/os/ServiceManager.java diff --git a/hiddenapi-stubs/src/main/java/android/os/ShellCallback.java b/hiddenapi/stubs/src/main/java/android/os/ShellCallback.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/ShellCallback.java rename to hiddenapi/stubs/src/main/java/android/os/ShellCallback.java diff --git a/hiddenapi-stubs/src/main/java/android/os/ShellCommand.java b/hiddenapi/stubs/src/main/java/android/os/ShellCommand.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/ShellCommand.java rename to hiddenapi/stubs/src/main/java/android/os/ShellCommand.java diff --git a/hiddenapi-stubs/src/main/java/android/os/SystemProperties.java b/hiddenapi/stubs/src/main/java/android/os/SystemProperties.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/SystemProperties.java rename to hiddenapi/stubs/src/main/java/android/os/SystemProperties.java diff --git a/hiddenapi-stubs/src/main/java/android/os/UserHandle.java b/hiddenapi/stubs/src/main/java/android/os/UserHandle.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/UserHandle.java rename to hiddenapi/stubs/src/main/java/android/os/UserHandle.java diff --git a/hiddenapi-stubs/src/main/java/android/os/UserManager.java b/hiddenapi/stubs/src/main/java/android/os/UserManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/os/UserManager.java rename to hiddenapi/stubs/src/main/java/android/os/UserManager.java diff --git a/hiddenapi-stubs/src/main/java/android/system/ErrnoException.java b/hiddenapi/stubs/src/main/java/android/system/ErrnoException.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/system/ErrnoException.java rename to hiddenapi/stubs/src/main/java/android/system/ErrnoException.java diff --git a/hiddenapi-stubs/src/main/java/android/system/Int32Ref.java b/hiddenapi/stubs/src/main/java/android/system/Int32Ref.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/system/Int32Ref.java rename to hiddenapi/stubs/src/main/java/android/system/Int32Ref.java diff --git a/hiddenapi-stubs/src/main/java/android/system/Os.java b/hiddenapi/stubs/src/main/java/android/system/Os.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/system/Os.java rename to hiddenapi/stubs/src/main/java/android/system/Os.java diff --git a/hiddenapi-stubs/src/main/java/android/util/DisplayMetrics.java b/hiddenapi/stubs/src/main/java/android/util/DisplayMetrics.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/util/DisplayMetrics.java rename to hiddenapi/stubs/src/main/java/android/util/DisplayMetrics.java diff --git a/hiddenapi-stubs/src/main/java/android/util/MutableInt.java b/hiddenapi/stubs/src/main/java/android/util/MutableInt.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/util/MutableInt.java rename to hiddenapi/stubs/src/main/java/android/util/MutableInt.java diff --git a/hiddenapi-stubs/src/main/java/android/util/TypedValue.java b/hiddenapi/stubs/src/main/java/android/util/TypedValue.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/util/TypedValue.java rename to hiddenapi/stubs/src/main/java/android/util/TypedValue.java diff --git a/hiddenapi-stubs/src/main/java/android/view/IWindowManager.java b/hiddenapi/stubs/src/main/java/android/view/IWindowManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/view/IWindowManager.java rename to hiddenapi/stubs/src/main/java/android/view/IWindowManager.java diff --git a/hiddenapi-stubs/src/main/java/android/webkit/WebViewDelegate.java b/hiddenapi/stubs/src/main/java/android/webkit/WebViewDelegate.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/webkit/WebViewDelegate.java rename to hiddenapi/stubs/src/main/java/android/webkit/WebViewDelegate.java diff --git a/hiddenapi-stubs/src/main/java/android/webkit/WebViewFactory.java b/hiddenapi/stubs/src/main/java/android/webkit/WebViewFactory.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/webkit/WebViewFactory.java rename to hiddenapi/stubs/src/main/java/android/webkit/WebViewFactory.java diff --git a/hiddenapi-stubs/src/main/java/android/webkit/WebViewFactoryProvider.java b/hiddenapi/stubs/src/main/java/android/webkit/WebViewFactoryProvider.java similarity index 100% rename from hiddenapi-stubs/src/main/java/android/webkit/WebViewFactoryProvider.java rename to hiddenapi/stubs/src/main/java/android/webkit/WebViewFactoryProvider.java diff --git a/hiddenapi-stubs/src/main/java/androidx/annotation/IntRange.java b/hiddenapi/stubs/src/main/java/androidx/annotation/IntRange.java similarity index 100% rename from hiddenapi-stubs/src/main/java/androidx/annotation/IntRange.java rename to hiddenapi/stubs/src/main/java/androidx/annotation/IntRange.java diff --git a/hiddenapi-stubs/src/main/java/androidx/annotation/RequiresApi.java b/hiddenapi/stubs/src/main/java/androidx/annotation/RequiresApi.java similarity index 100% rename from hiddenapi-stubs/src/main/java/androidx/annotation/RequiresApi.java rename to hiddenapi/stubs/src/main/java/androidx/annotation/RequiresApi.java diff --git a/hiddenapi-stubs/src/main/java/com/android/internal/os/BinderInternal.java b/hiddenapi/stubs/src/main/java/com/android/internal/os/BinderInternal.java similarity index 100% rename from hiddenapi-stubs/src/main/java/com/android/internal/os/BinderInternal.java rename to hiddenapi/stubs/src/main/java/com/android/internal/os/BinderInternal.java diff --git a/hiddenapi-stubs/src/main/java/com/android/internal/os/ZygoteInit.java b/hiddenapi/stubs/src/main/java/com/android/internal/os/ZygoteInit.java similarity index 100% rename from hiddenapi-stubs/src/main/java/com/android/internal/os/ZygoteInit.java rename to hiddenapi/stubs/src/main/java/com/android/internal/os/ZygoteInit.java diff --git a/hiddenapi-stubs/src/main/java/com/android/internal/util/XmlUtils.java b/hiddenapi/stubs/src/main/java/com/android/internal/util/XmlUtils.java similarity index 100% rename from hiddenapi-stubs/src/main/java/com/android/internal/util/XmlUtils.java rename to hiddenapi/stubs/src/main/java/com/android/internal/util/XmlUtils.java diff --git a/hiddenapi-stubs/src/main/java/com/android/server/LocalServices.java b/hiddenapi/stubs/src/main/java/com/android/server/LocalServices.java similarity index 100% rename from hiddenapi-stubs/src/main/java/com/android/server/LocalServices.java rename to hiddenapi/stubs/src/main/java/com/android/server/LocalServices.java diff --git a/hiddenapi-stubs/src/main/java/com/android/server/SystemService.java b/hiddenapi/stubs/src/main/java/com/android/server/SystemService.java similarity index 100% rename from hiddenapi-stubs/src/main/java/com/android/server/SystemService.java rename to hiddenapi/stubs/src/main/java/com/android/server/SystemService.java diff --git a/hiddenapi-stubs/src/main/java/com/android/server/SystemServiceManager.java b/hiddenapi/stubs/src/main/java/com/android/server/SystemServiceManager.java similarity index 100% rename from hiddenapi-stubs/src/main/java/com/android/server/SystemServiceManager.java rename to hiddenapi/stubs/src/main/java/com/android/server/SystemServiceManager.java diff --git a/hiddenapi-stubs/src/main/java/com/android/server/am/ActivityManagerService.java b/hiddenapi/stubs/src/main/java/com/android/server/am/ActivityManagerService.java similarity index 100% rename from hiddenapi-stubs/src/main/java/com/android/server/am/ActivityManagerService.java rename to hiddenapi/stubs/src/main/java/com/android/server/am/ActivityManagerService.java diff --git a/hiddenapi-stubs/src/main/java/com/android/server/am/ProcessRecord.java b/hiddenapi/stubs/src/main/java/com/android/server/am/ProcessRecord.java similarity index 100% rename from hiddenapi-stubs/src/main/java/com/android/server/am/ProcessRecord.java rename to hiddenapi/stubs/src/main/java/com/android/server/am/ProcessRecord.java diff --git a/hiddenapi-stubs/src/main/java/dalvik/system/BaseDexClassLoader.java b/hiddenapi/stubs/src/main/java/dalvik/system/BaseDexClassLoader.java similarity index 100% rename from hiddenapi-stubs/src/main/java/dalvik/system/BaseDexClassLoader.java rename to hiddenapi/stubs/src/main/java/dalvik/system/BaseDexClassLoader.java diff --git a/hiddenapi-stubs/src/main/java/dalvik/system/VMRuntime.java b/hiddenapi/stubs/src/main/java/dalvik/system/VMRuntime.java similarity index 100% rename from hiddenapi-stubs/src/main/java/dalvik/system/VMRuntime.java rename to hiddenapi/stubs/src/main/java/dalvik/system/VMRuntime.java diff --git a/hiddenapi-stubs/src/main/java/org/xmlpull/v1/XmlPullParserException.java b/hiddenapi/stubs/src/main/java/org/xmlpull/v1/XmlPullParserException.java similarity index 100% rename from hiddenapi-stubs/src/main/java/org/xmlpull/v1/XmlPullParserException.java rename to hiddenapi/stubs/src/main/java/org/xmlpull/v1/XmlPullParserException.java diff --git a/hiddenapi-stubs/src/main/java/sun/net/www/ParseUtil.java b/hiddenapi/stubs/src/main/java/sun/net/www/ParseUtil.java similarity index 100% rename from hiddenapi-stubs/src/main/java/sun/net/www/ParseUtil.java rename to hiddenapi/stubs/src/main/java/sun/net/www/ParseUtil.java diff --git a/hiddenapi-stubs/src/main/java/xposed/dummy/XResourcesSuperClass.java b/hiddenapi/stubs/src/main/java/xposed/dummy/XResourcesSuperClass.java similarity index 100% rename from hiddenapi-stubs/src/main/java/xposed/dummy/XResourcesSuperClass.java rename to hiddenapi/stubs/src/main/java/xposed/dummy/XResourcesSuperClass.java diff --git a/hiddenapi-stubs/src/main/java/xposed/dummy/XTypedArraySuperClass.java b/hiddenapi/stubs/src/main/java/xposed/dummy/XTypedArraySuperClass.java similarity index 100% rename from hiddenapi-stubs/src/main/java/xposed/dummy/XTypedArraySuperClass.java rename to hiddenapi/stubs/src/main/java/xposed/dummy/XTypedArraySuperClass.java diff --git a/settings.gradle.kts b/settings.gradle.kts index f0485ecb..74f8fd3a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,19 @@ +pluginManagement { + val navVersion: String by settings + val agpVersion: String by settings + repositories { + gradlePluginPortal() + google() + mavenCentral() + } + plugins { + id("com.android.library") version agpVersion + id("com.android.application") version agpVersion + id("androidx.navigation.safeargs") version navVersion + id("dev.rikka.tools.autoresconfig") version "1.1.0" + } +} + dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { @@ -9,11 +25,11 @@ dependencyResolutionManagement { rootProject.name = "LSPosed" include( ":core", - ":hiddenapi-stubs", + ":hiddenapi:stubs", + ":hiddenapi:bridge", ":app", ":service", ":interface", - ":hiddenapi-bridge", ":manager-service", ":daemon", ":daemon-service"