From 22d18846e92a3f88701aeb924fe5634113445ef5 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Fri, 29 Jan 2021 01:14:53 +0800 Subject: [PATCH] Find & Replace --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/workflows/core.yml | 6 +- .gitmodules | 4 +- README.md | 10 +- app/build.gradle | 2 +- app/proguard-rules.pro | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../github/lsposed}/manager/App.java | 12 +- .../github/lsposed}/manager/Constants.java | 2 +- .../lsposed}/manager/adapters/AppAdapter.java | 10 +- .../lsposed}/manager/adapters/AppHelper.java | 10 +- .../manager/adapters/BlackListAdapter.java | 6 +- .../manager/adapters/ScopeAdapter.java | 8 +- .../manager/receivers/EdServiceReceiver.java | 6 +- .../manager/ui/activity/AboutActivity.java | 12 +- .../manager/ui/activity/AppListActivity.java | 16 +- .../manager/ui/activity/BaseActivity.java | 14 +- .../ui/activity/CrashReportActivity.java | 8 +- .../manager/ui/activity/LogsActivity.java | 18 +- .../manager/ui/activity/MainActivity.java | 20 +- .../manager/ui/activity/ModulesActivity.java | 22 +- .../manager/ui/activity/SettingsActivity.java | 10 +- .../ui/fragment/CompileDialogFragment.java | 12 +- .../ui/fragment/StatusDialogBuilder.java | 12 +- .../ui/widget/IntegerListPreference.java | 2 +- .../manager/ui/widget/MasterSwitch.java | 4 +- .../ui/widget/RecyclerViewBugFixed.java | 2 +- .../ui/widget/ThemeColorPreference.java | 6 +- .../lsposed}/manager/util/CompileUtil.java | 8 +- .../manager/util/CustomThemeColor.java | 2 +- .../manager/util/CustomThemeColors.java | 4 +- .../lsposed}/manager/util/GlideHelper.java | 2 +- .../lsposed}/manager/util/IconLoader.java | 4 +- .../manager/util/LinearLayoutManagerFix.java | 2 +- .../lsposed}/manager/util/ModuleUtil.java | 10 +- .../github/lsposed}/manager/util/NavUtil.java | 8 +- .../manager/util/NotificationUtil.java | 10 +- .../lsposed}/manager/util/RebootUtil.java | 6 +- .../lsposed}/manager/util/Singleton.java | 2 +- .../lsposed}/manager/util/ToastUtil.java | 2 +- .../lsposed}/manager/util/light/Hack.java | 2 +- .../lsposed}/manager/util/light/Light.java | 2 +- app/src/main/res/layout/activity_logs.xml | 2 +- app/src/main/res/layout/activity_modules.xml | 2 +- .../main/res/layout/activity_scope_list.xml | 4 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/prefs.xml | 6 +- app/src/main/res/xml/shortcuts.xml | 8 +- build.gradle | 4 +- {edxp-core => core}/.gitignore | 0 {edxp-core => core}/build.gradle | 14 +- {edxp-core => core}/proguard-rules.pro | 8 +- core/src/main/AndroidManifest.xml | 1 + .../src/main/cpp/CMakeLists.txt | 0 .../src/main/cpp/external/CMakeLists.txt | 0 .../main/cpp/external/android/CMakeLists.txt | 0 .../external/android/android-base/file.cpp | 0 .../cpp/external/android/android-base/file.h | 0 .../external/android/android-base/logging.cpp | 0 .../external/android/android-base/logging.h | 2 +- .../external/android/android-base/macros.h | 0 .../external/android/android-base/off64_t.h | 0 .../external/android/android-base/parseint.h | 0 .../external/android/android-base/strings.cpp | 0 .../external/android/android-base/strings.h | 0 .../android/android-base/thread_annotations.h | 0 .../external/android/android-base/threads.cpp | 0 .../external/android/android-base/threads.h | 0 .../external/android/android-base/unique_fd.h | 0 .../cpp/external/android/android-base/utf8.h | 0 .../main/cpp/external/android/android/fdsan.h | 0 .../cpp/external/android/art/base/macros.h | 0 .../android/art/runtime/native/native_util.h | 0 .../android/nativehelper/jni_macros.h | 0 .../android/nativehelper/module_api.h | 0 .../android/nativehelper/nativehelper_utils.h | 0 .../android/nativehelper/scoped_local_ref.h | 0 .../main/cpp/external/xhook/CMakeLists.txt | 0 .../main/cpp/external/xhook/include/xhook.h | 0 .../src/main/cpp/external/xhook/src/queue.h | 0 .../src/main/cpp/external/xhook/src/tree.h | 0 .../src/main/cpp/external/xhook/src/xh_core.c | 0 .../src/main/cpp/external/xhook/src/xh_core.h | 0 .../src/main/cpp/external/xhook/src/xh_elf.c | 0 .../src/main/cpp/external/xhook/src/xh_elf.h | 0 .../main/cpp/external/xhook/src/xh_errno.h | 0 .../src/main/cpp/external/xhook/src/xh_jni.c | 0 .../src/main/cpp/external/xhook/src/xh_log.c | 0 .../src/main/cpp/external/xhook/src/xh_log.h | 0 .../src/main/cpp/external/xhook/src/xh_util.c | 0 .../src/main/cpp/external/xhook/src/xh_util.h | 0 .../main/cpp/external/xhook/src/xh_version.c | 0 .../main/cpp/external/xhook/src/xh_version.h | 0 .../src/main/cpp/external/xhook/src/xhook.c | 0 .../src/main/cpp/external/xhook/src/xhook.h | 0 .../main/cpp/external/yahfa/CMakeLists.txt | 0 .../cpp/external/yahfa/include/HookMain.h | 0 .../cpp/external/yahfa/include/trampoline.h | 0 .../main/cpp/external/yahfa/src/HookMain.c | 0 .../src/main/cpp/external/yahfa/src/common.h | 2 +- .../main/cpp/external/yahfa/src/trampoline.c | 0 .../src/main/cpp/main/CMakeLists.txt | 4 +- .../src/main/cpp/main/include/ByteOrder.h | 6 +- .../src/main/cpp/main/include/JNIHelper.h | 0 .../cpp/main/include/art/runtime/art_method.h | 8 +- .../main/include/art/runtime/class_linker.h | 26 +-- .../art/runtime/gc/collector/gc_type.h | 0 .../main/include/art/runtime/gc/gc_cause.h | 0 .../cpp/main/include/art/runtime/gc/heap.h | 16 +- .../cpp/main/include/art/runtime/hidden_api.h | 10 +- .../include/art/runtime/instrumentation.h | 10 +- .../main/include/art/runtime/jni_env_ext.h | 2 +- .../main/include/art/runtime/mirror/class.h | 6 +- .../cpp/main/include/art/runtime/reflection.h | 8 +- .../cpp/main/include/art/runtime/runtime.h | 2 +- .../cpp/main/include/art/runtime/thread.h | 4 +- .../src/main/cpp/main/include/base/object.h | 18 +- .../src/main/cpp/main/include/config.h | 6 +- .../src/main/cpp/main/include/dl_util.h | 4 +- .../framework/androidfw/ResourceTypes.h | 0 .../src/main/cpp/main/include/logging.h | 2 +- .../src/main/cpp/main/include/native_util.h | 6 +- .../src/main/cpp/main/include/utils.h | 2 +- .../src/main/cpp/main/src/config_manager.cpp | 12 +- .../src/main/cpp/main/src/config_manager.h | 18 +- .../src/main/cpp/main/src/context.cpp | 18 +- .../src/main/cpp/main/src/context.h | 2 +- .../cpp/main/src/jni/art_class_linker.cpp | 2 +- .../main/cpp/main/src/jni/art_class_linker.h | 4 +- .../src/main/cpp/main/src/jni/art_heap.cpp | 4 +- .../src/main/cpp/main/src/jni/art_heap.h | 4 +- .../main/cpp/main/src/jni/config_manager.cpp | 8 +- .../main/cpp/main/src/jni/config_manager.h | 2 +- .../main/cpp/main/src/jni/pending_hooks.cpp | 4 +- .../src/main/cpp/main/src/jni/pending_hooks.h | 4 +- .../main/cpp/main/src/jni/resources_hook.cpp | 6 +- .../main/cpp/main/src/jni/resources_hook.h | 4 +- .../src/main/cpp/main/src/jni/yahfa.cpp | 12 +- .../src/main/cpp/main/src/jni/yahfa.h | 4 +- .../src/main/cpp/main/src/main.cpp | 22 +- .../src/main/cpp/main/src/native_hook.cpp | 2 +- .../src/main/cpp/main/src/native_hook.h | 2 +- .../src/main/cpp/main/src/resource_hook.cpp | 4 +- .../src/main/cpp/main/src/resource_hook.h | 2 +- .../src/main/cpp/main/src/riru_hook.cpp | 4 +- .../src/main/cpp/main/src/riru_hook.h | 2 +- .../src/main/cpp/main/src/rirud_socket.cpp | 0 .../src/main/cpp/main/src/rirud_socket.h | 0 .../java/android/app/AndroidAppHelper.java | 0 .../main/java/android/app/package-info.java | 0 .../android/content/res/XModuleResources.java | 0 .../android/content/res/XResForwarder.java | 0 .../java/android/content/res/XResources.java | 0 .../android/content/res/package-info.java | 0 .../de/robv/android/xposed/DexCreator.java | 0 .../robv/android/xposed/IModuleContext.java | 0 .../android/xposed/IXposedHookCmdInit.java | 0 .../IXposedHookInitPackageResources.java | 0 .../xposed/IXposedHookLoadPackage.java | 0 .../android/xposed/IXposedHookZygoteInit.java | 0 .../de/robv/android/xposed/IXposedMod.java | 0 .../de/robv/android/xposed/LspHooker.java | 0 .../de/robv/android/xposed/PendingHooks.java | 0 .../de/robv/android/xposed/SELinuxHelper.java | 0 .../de/robv/android/xposed/XC_MethodHook.java | 0 .../android/xposed/XC_MethodReplacement.java | 0 .../android/xposed/XSharedPreferences.java | 4 +- .../de/robv/android/xposed/XposedBridge.java | 20 +- .../de/robv/android/xposed/XposedHelpers.java | 0 .../de/robv/android/xposed/XposedInit.java | 6 +- .../xposed/annotation/ApiSensitive.java | 0 .../robv/android/xposed/annotation/Level.java | 0 .../android/xposed/callbacks/IXUnhook.java | 0 .../callbacks/XC_InitPackageResources.java | 0 .../xposed/callbacks/XC_InitZygote.java | 0 .../xposed/callbacks/XC_LayoutInflated.java | 0 .../xposed/callbacks/XC_LoadPackage.java | 0 .../android/xposed/callbacks/XCallback.java | 4 +- .../xposed/callbacks/package-info.java | 0 .../de/robv/android/xposed/package-info.java | 0 .../android/xposed/services/BaseService.java | 0 .../xposed/services/BinderService.java | 0 .../xposed/services/DirectAccessService.java | 0 .../android/xposed/services/FileResult.java | 0 .../xposed/services/ZygoteService.java | 0 .../android/xposed/services/package-info.java | 0 .../external/com/android/dex/Annotation.java | 0 .../external/com/android/dex/CallSiteId.java | 0 .../external/com/android/dex/ClassData.java | 0 .../external/com/android/dex/ClassDef.java | 0 .../java/external/com/android/dex/Code.java | 0 .../java/external/com/android/dex/Dex.java | 0 .../com/android/dex/DexException.java | 0 .../external/com/android/dex/DexFormat.java | 0 .../dex/DexIndexOverflowException.java | 0 .../com/android/dex/EncodedValue.java | 0 .../com/android/dex/EncodedValueCodec.java | 0 .../com/android/dex/EncodedValueReader.java | 0 .../external/com/android/dex/FieldId.java | 0 .../java/external/com/android/dex/Leb128.java | 0 .../com/android/dex/MethodHandle.java | 0 .../external/com/android/dex/MethodId.java | 0 .../java/external/com/android/dex/Mutf8.java | 0 .../external/com/android/dex/ProtoId.java | 0 .../java/external/com/android/dex/SizeOf.java | 0 .../com/android/dex/TableOfContents.java | 0 .../external/com/android/dex/TypeList.java | 0 .../android/dex/util/ByteArrayByteInput.java | 0 .../com/android/dex/util/ByteInput.java | 0 .../com/android/dex/util/ByteOutput.java | 0 .../dex/util/ExceptionWithContext.java | 0 .../com/android/dex/util/FileUtils.java | 0 .../com/android/dex/util/Unsigned.java | 0 .../external/com/android/dx/AnnotationId.java | 0 .../com/android/dx/AppDataDirGuesser.java | 0 .../external/com/android/dx/BinaryOp.java | 0 .../java/external/com/android/dx/Code.java | 0 .../external/com/android/dx/Comparison.java | 0 .../external/com/android/dx/Constants.java | 0 .../external/com/android/dx/DexMaker.java | 0 .../java/external/com/android/dx/FieldId.java | 0 .../java/external/com/android/dx/Label.java | 0 .../java/external/com/android/dx/Local.java | 0 .../external/com/android/dx/MethodId.java | 0 .../java/external/com/android/dx/TypeId.java | 0 .../external/com/android/dx/TypeList.java | 0 .../java/external/com/android/dx/UnaryOp.java | 0 .../java/external/com/android/dx/Version.java | 0 .../dx/cf/attrib/AttAnnotationDefault.java | 0 .../dx/cf/attrib/AttBootstrapMethods.java | 0 .../com/android/dx/cf/attrib/AttCode.java | 0 .../dx/cf/attrib/AttConstantValue.java | 0 .../android/dx/cf/attrib/AttDeprecated.java | 0 .../dx/cf/attrib/AttEnclosingMethod.java | 0 .../android/dx/cf/attrib/AttExceptions.java | 0 .../android/dx/cf/attrib/AttInnerClasses.java | 0 .../dx/cf/attrib/AttLineNumberTable.java | 0 .../dx/cf/attrib/AttLocalVariableTable.java | 0 .../cf/attrib/AttLocalVariableTypeTable.java | 0 .../AttRuntimeInvisibleAnnotations.java | 0 ...tRuntimeInvisibleParameterAnnotations.java | 0 .../attrib/AttRuntimeVisibleAnnotations.java | 0 ...AttRuntimeVisibleParameterAnnotations.java | 0 .../android/dx/cf/attrib/AttSignature.java | 0 .../dx/cf/attrib/AttSourceDebugExtension.java | 0 .../android/dx/cf/attrib/AttSourceFile.java | 0 .../android/dx/cf/attrib/AttSynthetic.java | 0 .../android/dx/cf/attrib/BaseAnnotations.java | 0 .../android/dx/cf/attrib/BaseAttribute.java | 0 .../dx/cf/attrib/BaseLocalVariables.java | 0 .../cf/attrib/BaseParameterAnnotations.java | 0 .../android/dx/cf/attrib/InnerClassList.java | 0 .../android/dx/cf/attrib/RawAttribute.java | 0 .../com/android/dx/cf/attrib/package.html | 0 .../com/android/dx/cf/code/BaseMachine.java | 0 .../com/android/dx/cf/code/BasicBlocker.java | 0 .../cf/code/BootstrapMethodArgumentsList.java | 0 .../dx/cf/code/BootstrapMethodsList.java | 0 .../com/android/dx/cf/code/ByteBlock.java | 0 .../com/android/dx/cf/code/ByteBlockList.java | 0 .../com/android/dx/cf/code/ByteCatchList.java | 0 .../com/android/dx/cf/code/ByteOps.java | 0 .../com/android/dx/cf/code/BytecodeArray.java | 0 .../android/dx/cf/code/ConcreteMethod.java | 0 .../android/dx/cf/code/ExecutionStack.java | 0 .../com/android/dx/cf/code/Frame.java | 0 .../android/dx/cf/code/LineNumberList.java | 0 .../android/dx/cf/code/LocalVariableList.java | 0 .../com/android/dx/cf/code/LocalsArray.java | 0 .../android/dx/cf/code/LocalsArraySet.java | 0 .../com/android/dx/cf/code/Machine.java | 0 .../com/android/dx/cf/code/Merger.java | 0 .../android/dx/cf/code/OneLocalsArray.java | 0 .../com/android/dx/cf/code/ReturnAddress.java | 0 .../com/android/dx/cf/code/Ropper.java | 0 .../com/android/dx/cf/code/RopperMachine.java | 0 .../com/android/dx/cf/code/SimException.java | 0 .../com/android/dx/cf/code/Simulator.java | 0 .../com/android/dx/cf/code/SwitchList.java | 0 .../android/dx/cf/code/ValueAwareMachine.java | 0 .../com/android/dx/cf/code/package.html | 0 .../android/dx/cf/cst/ConstantPoolParser.java | 0 .../com/android/dx/cf/cst/ConstantTags.java | 0 .../android/dx/cf/cst/MethodHandleKind.java | 0 .../dx/cf/direct/AnnotationParser.java | 0 .../dx/cf/direct/AttributeFactory.java | 0 .../dx/cf/direct/AttributeListParser.java | 0 .../android/dx/cf/direct/ClassPathOpener.java | 0 .../android/dx/cf/direct/CodeObserver.java | 0 .../android/dx/cf/direct/DirectClassFile.java | 0 .../android/dx/cf/direct/FieldListParser.java | 0 .../dx/cf/direct/MemberListParser.java | 0 .../dx/cf/direct/MethodListParser.java | 0 .../dx/cf/direct/StdAttributeFactory.java | 0 .../com/android/dx/cf/direct/package.html | 0 .../com/android/dx/cf/iface/Attribute.java | 0 .../android/dx/cf/iface/AttributeList.java | 0 .../com/android/dx/cf/iface/ClassFile.java | 0 .../com/android/dx/cf/iface/Field.java | 0 .../com/android/dx/cf/iface/FieldList.java | 0 .../com/android/dx/cf/iface/HasAttribute.java | 0 .../com/android/dx/cf/iface/Member.java | 0 .../com/android/dx/cf/iface/Method.java | 0 .../com/android/dx/cf/iface/MethodList.java | 0 .../android/dx/cf/iface/ParseException.java | 0 .../android/dx/cf/iface/ParseObserver.java | 0 .../android/dx/cf/iface/StdAttributeList.java | 0 .../com/android/dx/cf/iface/StdField.java | 0 .../com/android/dx/cf/iface/StdFieldList.java | 0 .../com/android/dx/cf/iface/StdMember.java | 0 .../com/android/dx/cf/iface/StdMethod.java | 0 .../android/dx/cf/iface/StdMethodList.java | 0 .../com/android/dx/cf/iface/package.html | 0 .../external/com/android/dx/command/Main.java | 0 .../android/dx/command/UsageException.java | 0 .../dx/command/annotool/AnnotationLister.java | 0 .../com/android/dx/command/annotool/Main.java | 0 .../android/dx/command/dexer/DxContext.java | 0 .../com/android/dx/command/dexer/Main.java | 0 .../com/android/dx/command/dump/Args.java | 0 .../android/dx/command/dump/BaseDumper.java | 0 .../android/dx/command/dump/BlockDumper.java | 0 .../android/dx/command/dump/ClassDumper.java | 0 .../android/dx/command/dump/DotDumper.java | 0 .../com/android/dx/command/dump/Main.java | 0 .../android/dx/command/dump/SsaDumper.java | 0 .../dx/command/findusages/FindUsages.java | 0 .../android/dx/command/findusages/Main.java | 0 .../com/android/dx/command/grep/Grep.java | 0 .../com/android/dx/command/grep/Main.java | 0 .../com/android/dx/dex/DexOptions.java | 0 .../dx/dex/cf/AttributeTranslator.java | 0 .../com/android/dx/dex/cf/CfOptions.java | 0 .../com/android/dx/dex/cf/CfTranslator.java | 0 .../com/android/dx/dex/cf/CodeStatistics.java | 0 .../android/dx/dex/cf/OptimizerOptions.java | 0 .../com/android/dx/dex/cf/package.html | 0 .../com/android/dx/dex/code/ArrayData.java | 0 .../android/dx/dex/code/BlockAddresses.java | 0 .../com/android/dx/dex/code/CatchBuilder.java | 0 .../android/dx/dex/code/CatchHandlerList.java | 0 .../com/android/dx/dex/code/CatchTable.java | 0 .../com/android/dx/dex/code/CodeAddress.java | 0 .../com/android/dx/dex/code/CstInsn.java | 0 .../com/android/dx/dex/code/DalvCode.java | 0 .../com/android/dx/dex/code/DalvInsn.java | 0 .../com/android/dx/dex/code/DalvInsnList.java | 0 .../external/com/android/dx/dex/code/Dop.java | 0 .../com/android/dx/dex/code/Dops.java | 0 .../android/dx/dex/code/FixedSizeInsn.java | 0 .../dx/dex/code/HighRegisterPrefix.java | 0 .../com/android/dx/dex/code/InsnFormat.java | 0 .../com/android/dx/dex/code/LocalList.java | 0 .../android/dx/dex/code/LocalSnapshot.java | 0 .../com/android/dx/dex/code/LocalStart.java | 0 .../com/android/dx/dex/code/MultiCstInsn.java | 0 .../com/android/dx/dex/code/OddSpacer.java | 0 .../android/dx/dex/code/OutputCollector.java | 0 .../android/dx/dex/code/OutputFinisher.java | 0 .../com/android/dx/dex/code/PositionList.java | 0 .../com/android/dx/dex/code/RopToDop.java | 0 .../android/dx/dex/code/RopTranslator.java | 0 .../com/android/dx/dex/code/SimpleInsn.java | 0 .../android/dx/dex/code/StdCatchBuilder.java | 0 .../com/android/dx/dex/code/SwitchData.java | 0 .../com/android/dx/dex/code/TargetInsn.java | 0 .../android/dx/dex/code/VariableSizeInsn.java | 0 .../com/android/dx/dex/code/ZeroSizeInsn.java | 0 .../com/android/dx/dex/code/form/Form10t.java | 0 .../com/android/dx/dex/code/form/Form10x.java | 0 .../com/android/dx/dex/code/form/Form11n.java | 0 .../com/android/dx/dex/code/form/Form11x.java | 0 .../com/android/dx/dex/code/form/Form12x.java | 0 .../com/android/dx/dex/code/form/Form20t.java | 0 .../com/android/dx/dex/code/form/Form21c.java | 0 .../com/android/dx/dex/code/form/Form21h.java | 0 .../com/android/dx/dex/code/form/Form21s.java | 0 .../com/android/dx/dex/code/form/Form21t.java | 0 .../com/android/dx/dex/code/form/Form22b.java | 0 .../com/android/dx/dex/code/form/Form22c.java | 0 .../com/android/dx/dex/code/form/Form22s.java | 0 .../com/android/dx/dex/code/form/Form22t.java | 0 .../com/android/dx/dex/code/form/Form22x.java | 0 .../com/android/dx/dex/code/form/Form23x.java | 0 .../com/android/dx/dex/code/form/Form30t.java | 0 .../com/android/dx/dex/code/form/Form31c.java | 0 .../com/android/dx/dex/code/form/Form31i.java | 0 .../com/android/dx/dex/code/form/Form31t.java | 0 .../com/android/dx/dex/code/form/Form32x.java | 0 .../com/android/dx/dex/code/form/Form35c.java | 0 .../com/android/dx/dex/code/form/Form3rc.java | 0 .../android/dx/dex/code/form/Form45cc.java | 0 .../android/dx/dex/code/form/Form4rcc.java | 0 .../com/android/dx/dex/code/form/Form51l.java | 0 .../dx/dex/code/form/SpecialFormat.java | 0 .../android/dx/dex/file/AnnotationItem.java | 0 .../dx/dex/file/AnnotationSetItem.java | 0 .../dx/dex/file/AnnotationSetRefItem.java | 0 .../android/dx/dex/file/AnnotationUtils.java | 0 .../dx/dex/file/AnnotationsDirectoryItem.java | 0 .../android/dx/dex/file/CallSiteIdItem.java | 0 .../dx/dex/file/CallSiteIdsSection.java | 0 .../com/android/dx/dex/file/CallSiteItem.java | 0 .../com/android/dx/dex/file/CatchStructs.java | 0 .../android/dx/dex/file/ClassDataItem.java | 0 .../com/android/dx/dex/file/ClassDefItem.java | 0 .../android/dx/dex/file/ClassDefsSection.java | 0 .../com/android/dx/dex/file/CodeItem.java | 0 .../dx/dex/file/DebugInfoConstants.java | 0 .../android/dx/dex/file/DebugInfoDecoder.java | 0 .../android/dx/dex/file/DebugInfoEncoder.java | 0 .../android/dx/dex/file/DebugInfoItem.java | 0 .../com/android/dx/dex/file/DexFile.java | 0 .../android/dx/dex/file/EncodedArrayItem.java | 0 .../com/android/dx/dex/file/EncodedField.java | 0 .../android/dx/dex/file/EncodedMember.java | 0 .../android/dx/dex/file/EncodedMethod.java | 0 .../dx/dex/file/FieldAnnotationStruct.java | 0 .../com/android/dx/dex/file/FieldIdItem.java | 0 .../android/dx/dex/file/FieldIdsSection.java | 0 .../com/android/dx/dex/file/HeaderItem.java | 0 .../android/dx/dex/file/HeaderSection.java | 0 .../com/android/dx/dex/file/IdItem.java | 0 .../com/android/dx/dex/file/IndexedItem.java | 0 .../com/android/dx/dex/file/Item.java | 0 .../com/android/dx/dex/file/ItemType.java | 0 .../com/android/dx/dex/file/MapItem.java | 0 .../com/android/dx/dex/file/MemberIdItem.java | 0 .../android/dx/dex/file/MemberIdsSection.java | 0 .../dx/dex/file/MethodAnnotationStruct.java | 0 .../android/dx/dex/file/MethodHandleItem.java | 0 .../dx/dex/file/MethodHandlesSection.java | 0 .../com/android/dx/dex/file/MethodIdItem.java | 0 .../android/dx/dex/file/MethodIdsSection.java | 0 .../android/dx/dex/file/MixedItemSection.java | 0 .../android/dx/dex/file/OffsettedItem.java | 0 .../dex/file/ParameterAnnotationStruct.java | 0 .../com/android/dx/dex/file/ProtoIdItem.java | 0 .../android/dx/dex/file/ProtoIdsSection.java | 0 .../com/android/dx/dex/file/Section.java | 0 .../com/android/dx/dex/file/Statistics.java | 0 .../android/dx/dex/file/StringDataItem.java | 0 .../com/android/dx/dex/file/StringIdItem.java | 0 .../android/dx/dex/file/StringIdsSection.java | 0 .../com/android/dx/dex/file/TypeIdItem.java | 0 .../android/dx/dex/file/TypeIdsSection.java | 0 .../com/android/dx/dex/file/TypeListItem.java | 0 .../dx/dex/file/UniformItemSection.java | 0 .../android/dx/dex/file/UniformListItem.java | 0 .../com/android/dx/dex/file/ValueEncoder.java | 0 .../com/android/dx/io/CodeReader.java | 0 .../com/android/dx/io/DexIndexPrinter.java | 0 .../external/com/android/dx/io/IndexType.java | 0 .../com/android/dx/io/OpcodeInfo.java | 0 .../external/com/android/dx/io/Opcodes.java | 0 .../dx/io/instructions/AddressMap.java | 0 .../dx/io/instructions/BaseCodeCursor.java | 0 .../dx/io/instructions/CodeCursor.java | 0 .../android/dx/io/instructions/CodeInput.java | 0 .../dx/io/instructions/CodeOutput.java | 0 .../io/instructions/DecodedInstruction.java | 0 ...illArrayDataPayloadDecodedInstruction.java | 0 .../FiveRegisterDecodedInstruction.java | 0 .../FourRegisterDecodedInstruction.java | 0 .../dx/io/instructions/InstructionCodec.java | 0 .../InvokePolymorphicDecodedInstruction.java | 0 ...okePolymorphicRangeDecodedInstruction.java | 0 .../OneRegisterDecodedInstruction.java | 0 ...PackedSwitchPayloadDecodedInstruction.java | 0 .../RegisterRangeDecodedInstruction.java | 0 .../io/instructions/ShortArrayCodeInput.java | 0 .../io/instructions/ShortArrayCodeOutput.java | 0 ...SparseSwitchPayloadDecodedInstruction.java | 0 .../ThreeRegisterDecodedInstruction.java | 0 .../TwoRegisterDecodedInstruction.java | 0 .../ZeroRegisterDecodedInstruction.java | 0 .../com/android/dx/merge/CollisionPolicy.java | 0 .../com/android/dx/merge/DexMerger.java | 0 .../com/android/dx/merge/IndexMap.java | 0 .../dx/merge/InstructionTransformer.java | 0 .../com/android/dx/merge/SortableType.java | 0 .../android/dx/rop/annotation/Annotation.java | 0 .../rop/annotation/AnnotationVisibility.java | 0 .../dx/rop/annotation/Annotations.java | 0 .../dx/rop/annotation/AnnotationsList.java | 0 .../dx/rop/annotation/NameValuePair.java | 0 .../com/android/dx/rop/code/AccessFlags.java | 0 .../com/android/dx/rop/code/BasicBlock.java | 0 .../android/dx/rop/code/BasicBlockList.java | 0 .../code/ConservativeTranslationAdvice.java | 0 .../com/android/dx/rop/code/CstInsn.java | 0 .../dx/rop/code/DexTranslationAdvice.java | 0 .../com/android/dx/rop/code/Exceptions.java | 0 .../dx/rop/code/FillArrayDataInsn.java | 0 .../com/android/dx/rop/code/Insn.java | 0 .../com/android/dx/rop/code/InsnList.java | 0 .../dx/rop/code/InvokePolymorphicInsn.java | 0 .../com/android/dx/rop/code/LocalItem.java | 0 .../dx/rop/code/LocalVariableExtractor.java | 0 .../dx/rop/code/LocalVariableInfo.java | 0 .../com/android/dx/rop/code/PlainCstInsn.java | 0 .../com/android/dx/rop/code/PlainInsn.java | 0 .../com/android/dx/rop/code/RegOps.java | 0 .../com/android/dx/rop/code/RegisterSpec.java | 0 .../android/dx/rop/code/RegisterSpecList.java | 0 .../android/dx/rop/code/RegisterSpecSet.java | 0 .../external/com/android/dx/rop/code/Rop.java | 0 .../com/android/dx/rop/code/RopMethod.java | 0 .../com/android/dx/rop/code/Rops.java | 0 .../android/dx/rop/code/SourcePosition.java | 0 .../com/android/dx/rop/code/SwitchInsn.java | 0 .../android/dx/rop/code/ThrowingCstInsn.java | 0 .../com/android/dx/rop/code/ThrowingInsn.java | 0 .../dx/rop/code/TranslationAdvice.java | 0 .../com/android/dx/rop/code/package.html | 0 .../com/android/dx/rop/cst/Constant.java | 0 .../com/android/dx/rop/cst/ConstantPool.java | 0 .../com/android/dx/rop/cst/CstAnnotation.java | 0 .../com/android/dx/rop/cst/CstArray.java | 0 .../android/dx/rop/cst/CstBaseMethodRef.java | 0 .../com/android/dx/rop/cst/CstBoolean.java | 0 .../com/android/dx/rop/cst/CstByte.java | 0 .../com/android/dx/rop/cst/CstCallSite.java | 0 .../android/dx/rop/cst/CstCallSiteRef.java | 0 .../com/android/dx/rop/cst/CstChar.java | 0 .../com/android/dx/rop/cst/CstDouble.java | 0 .../com/android/dx/rop/cst/CstEnumRef.java | 0 .../com/android/dx/rop/cst/CstFieldRef.java | 0 .../com/android/dx/rop/cst/CstFloat.java | 0 .../com/android/dx/rop/cst/CstInteger.java | 0 .../dx/rop/cst/CstInterfaceMethodRef.java | 0 .../android/dx/rop/cst/CstInvokeDynamic.java | 0 .../com/android/dx/rop/cst/CstKnownNull.java | 0 .../com/android/dx/rop/cst/CstLiteral32.java | 0 .../com/android/dx/rop/cst/CstLiteral64.java | 0 .../android/dx/rop/cst/CstLiteralBits.java | 0 .../com/android/dx/rop/cst/CstLong.java | 0 .../com/android/dx/rop/cst/CstMemberRef.java | 0 .../android/dx/rop/cst/CstMethodHandle.java | 0 .../com/android/dx/rop/cst/CstMethodRef.java | 0 .../com/android/dx/rop/cst/CstNat.java | 0 .../com/android/dx/rop/cst/CstProtoRef.java | 0 .../com/android/dx/rop/cst/CstShort.java | 0 .../com/android/dx/rop/cst/CstString.java | 0 .../com/android/dx/rop/cst/CstType.java | 0 .../android/dx/rop/cst/StdConstantPool.java | 0 .../com/android/dx/rop/cst/TypedConstant.java | 0 .../com/android/dx/rop/cst/Zeroes.java | 0 .../com/android/dx/rop/cst/package.html | 0 .../com/android/dx/rop/package-info.java | 0 .../com/android/dx/rop/type/Prototype.java | 0 .../com/android/dx/rop/type/StdTypeList.java | 0 .../com/android/dx/rop/type/Type.java | 0 .../com/android/dx/rop/type/TypeBearer.java | 0 .../com/android/dx/rop/type/TypeList.java | 0 .../com/android/dx/rop/type/package.html | 0 .../android/dx/ssa/BasicRegisterMapper.java | 0 .../com/android/dx/ssa/ConstCollector.java | 0 .../com/android/dx/ssa/DeadCodeRemover.java | 0 .../external/com/android/dx/ssa/DomFront.java | 0 .../com/android/dx/ssa/Dominators.java | 0 .../com/android/dx/ssa/EscapeAnalysis.java | 0 .../dx/ssa/InterferenceRegisterMapper.java | 0 .../com/android/dx/ssa/LiteralOpUpgrader.java | 0 .../dx/ssa/LocalVariableExtractor.java | 0 .../com/android/dx/ssa/LocalVariableInfo.java | 0 .../com/android/dx/ssa/MoveParamCombiner.java | 0 .../com/android/dx/ssa/NormalSsaInsn.java | 0 .../com/android/dx/ssa/Optimizer.java | 0 .../external/com/android/dx/ssa/PhiInsn.java | 0 .../com/android/dx/ssa/PhiTypeResolver.java | 0 .../com/android/dx/ssa/RegisterMapper.java | 0 .../external/com/android/dx/ssa/SCCP.java | 0 .../com/android/dx/ssa/SetFactory.java | 0 .../com/android/dx/ssa/SsaBasicBlock.java | 0 .../com/android/dx/ssa/SsaConverter.java | 0 .../external/com/android/dx/ssa/SsaInsn.java | 0 .../com/android/dx/ssa/SsaMethod.java | 0 .../com/android/dx/ssa/SsaRenamer.java | 0 .../dx/ssa/back/FirstFitAllocator.java | 0 .../back/FirstFitLocalCombiningAllocator.java | 0 .../dx/ssa/back/IdenticalBlockCombiner.java | 0 .../dx/ssa/back/InterferenceGraph.java | 0 .../android/dx/ssa/back/LivenessAnalyzer.java | 0 .../dx/ssa/back/NullRegisterAllocator.java | 0 .../dx/ssa/back/RegisterAllocator.java | 0 .../com/android/dx/ssa/back/SsaToRop.java | 0 .../com/android/dx/ssa/package-info.java | 0 .../com/android/dx/stock/ProxyBuilder.java | 0 .../com/android/dx/util/AnnotatedOutput.java | 0 .../com/android/dx/util/BitIntSet.java | 0 .../external/com/android/dx/util/Bits.java | 0 .../com/android/dx/util/ByteArray.java | 0 .../dx/util/ByteArrayAnnotatedOutput.java | 0 .../com/android/dx/util/FixedSizeList.java | 0 .../external/com/android/dx/util/Hex.java | 0 .../com/android/dx/util/HexParser.java | 0 .../com/android/dx/util/IndentingWriter.java | 0 .../com/android/dx/util/IntIterator.java | 0 .../external/com/android/dx/util/IntList.java | 0 .../external/com/android/dx/util/IntSet.java | 0 .../com/android/dx/util/LabeledItem.java | 0 .../com/android/dx/util/LabeledList.java | 0 .../com/android/dx/util/ListIntSet.java | 0 .../android/dx/util/MutabilityControl.java | 0 .../android/dx/util/MutabilityException.java | 0 .../external/com/android/dx/util/Output.java | 0 .../external/com/android/dx/util/ToHuman.java | 0 .../com/android/dx/util/TwoColumnOutput.java | 0 .../external/com/android/dx/util/Warning.java | 0 .../external/com/android/dx/util/Writers.java | 0 .../external/com/android/dx/util/package.html | 0 .../android/multidex/ArchivePathElement.java | 0 .../android/multidex/ClassPathElement.java | 0 .../multidex/ClassReferenceListBuilder.java | 0 .../android/multidex/FolderPathElement.java | 0 .../android/multidex/MainDexListBuilder.java | 0 .../external/com/android/multidex/Path.java | 0 .../org/apache/commons/lang3/ArrayUtils.java | 0 .../commons/lang3/CharSequenceUtils.java | 0 .../org/apache/commons/lang3/CharUtils.java | 0 .../org/apache/commons/lang3/ClassUtils.java | 0 .../org/apache/commons/lang3/JavaVersion.java | 0 .../org/apache/commons/lang3/LICENSE.txt | 0 .../apache/commons/lang3/MODIFICATIONS.txt | 0 .../org/apache/commons/lang3/NOTICE.txt | 0 .../org/apache/commons/lang3/ObjectUtils.java | 0 .../apache/commons/lang3/RELEASE-NOTES.txt | 0 .../org/apache/commons/lang3/StringUtils.java | 0 .../org/apache/commons/lang3/SystemUtils.java | 0 .../org/apache/commons/lang3/Validate.java | 0 .../apache/commons/lang3/builder/Builder.java | 0 .../lang3/builder/CompareToBuilder.java | 0 .../commons/lang3/builder/EqualsBuilder.java | 0 .../lang3/builder/HashCodeBuilder.java | 0 .../apache/commons/lang3/builder/IDKey.java | 0 .../builder/ReflectionToStringBuilder.java | 0 .../lang3/builder/ToStringBuilder.java | 0 .../commons/lang3/builder/ToStringStyle.java | 0 .../apache/commons/lang3/builder/package.html | 0 .../lang3/exception/CloneFailedException.java | 0 .../commons/lang3/exception/package.html | 0 .../apache/commons/lang3/mutable/Mutable.java | 0 .../commons/lang3/mutable/MutableInt.java | 0 .../apache/commons/lang3/mutable/package.html | 0 .../org/apache/commons/lang3/overview.html | 0 .../org/apache/commons/lang3/package.html | 0 .../commons/lang3/reflect/MemberUtils.java | 0 .../commons/lang3/reflect/MethodUtils.java | 0 .../apache/commons/lang3/reflect/package.html | 0 .../commons/lang3/tuple/ImmutablePair.java | 0 .../org/apache/commons/lang3/tuple/Pair.java | 0 .../apache/commons/lang3/tuple/package.html | 0 .../io/github/lsposed/common/KeepAll.java | 4 + .../io/github/lsposed/common/KeepMembers.java | 4 + .../lspd}/_hooker/impl/HandleBindApp.java | 10 +- .../lspd}/_hooker/impl/LoadedApkCstr.java | 4 +- .../lspd}/_hooker/impl/LoadedApkGetCL.java | 8 +- .../_hooker/impl/StartBootstrapServices.java | 6 +- .../lspd}/_hooker/impl/SystemMain.java | 8 +- .../github/lsposed/lspd}/art/ClassLinker.java | 4 +- .../io/github/lsposed/lspd}/art/Heap.java | 2 +- .../lspd}/config/BaseHookProvider.java | 8 +- .../lsposed/lspd}/config/ConfigManager.java | 2 +- .../lsposed/lspd/config/LSPdConfigGlobal.java | 6 +- .../lsposed/lspd}/core/BaseEdxpImpl.java | 6 +- .../github/lsposed/lspd}/core/EdxpImpl.java | 6 +- .../io/github/lsposed/lspd}/core/Main.java | 38 ++-- .../io/github/lsposed/lspd}/core/Proxy.java | 4 +- .../lsposed/lspd}/core/ResourcesHook.java | 2 +- .../io/github/lsposed/lspd}/core/Yahfa.java | 2 +- .../lsposed/lspd}/core/yahfa/HookMain.java | 8 +- .../lspd}/deopt/InlinedMethodCallers.java | 2 +- .../lspd}/deopt/PrebuiltMethodsDeopter.java | 18 +- .../lsposed/lspd}/framework/Zygote.java | 4 +- .../lsposed/lspd}/hook/HookProvider.java | 2 +- .../lspd}/hooker/XposedInstallerHooker.java | 58 +++--- .../github/lsposed/lspd}/proxy/BaseProxy.java | 4 +- .../lsposed/lspd}/proxy/BaseRouter.java | 14 +- .../lsposed/lspd}/proxy/NormalProxy.java | 10 +- .../io/github/lsposed/lspd}/proxy/Router.java | 2 +- .../sandhook/config/SandHookProvider.java | 12 +- .../lspd}/sandhook/core/SandHookEdxpImpl.java | 18 +- .../lspd}/sandhook/core/SandHookRouter.java | 20 +- .../sandhook/entry/AppBootstrapHookInfo.java | 8 +- .../sandhook/entry/SysBootstrapHookInfo.java | 10 +- .../sandhook/entry/SysInnerHookInfo.java | 10 +- .../sandhook/hooker/HandleBindAppHooker.java | 6 +- .../hooker/LoadedApkConstructorHooker.java | 6 +- .../hooker/StartBootstrapServicesHooker.java | 6 +- .../StartBootstrapServicesHooker11.java | 6 +- .../sandhook/hooker/SystemMainHooker.java | 6 +- .../lspd}/service/PackageReceiver.java | 12 +- .../lsposed/lspd}/service/ServiceProxy.java | 6 +- .../lsposed/lspd}/util/ClassLoaderUtils.java | 6 +- .../github/lsposed/lspd}/util/ClassUtils.java | 2 +- .../github/lsposed/lspd}/util/DexUtils.java | 2 +- .../github/lsposed/lspd}/util/FileUtils.java | 4 +- .../io/github/lsposed/lspd}/util/Hookers.java | 2 +- .../lsposed/lspd}/util/MetaDataReader.java | 2 +- .../lsposed/lspd}/util/ProcessUtils.java | 2 +- .../lsposed/lspd}/util/ProxyClassLoader.java | 2 +- .../io/github/lsposed/lspd}/util/Unsafe.java | 2 +- .../io/github/lsposed/lspd}/util/Utils.java | 6 +- .../github/lsposed/lspd}/util/Versions.java | 2 +- .../lspd}/yahfa/config/YahfaHookProvider.java | 14 +- .../lspd}/yahfa/core/YahfaEdxpImpl.java | 22 +- .../lsposed/lspd/yahfa/core/YahfaRouter.java | 21 ++ .../lsposed/lspd}/yahfa/dexmaker/DexLog.java | 6 +- .../lspd}/yahfa/dexmaker/DexMakerUtils.java | 6 +- .../lspd}/yahfa/dexmaker/DynamicBridge.java | 2 +- .../lspd}/yahfa/dexmaker/HookerDexMaker.java | 20 +- .../lspd}/yahfa/dexmaker/MethodInfo.java | 2 +- .../sandhook/xposedcompat/XposedCompat.java | 10 +- .../hookstub/CallOriginCallBack.java | 0 .../hookstub/HookMethodEntity.java | 0 .../hookstub/HookStubManager.java | 2 +- .../hookstub/MethodHookerStubs32.java | 0 .../hookstub/MethodHookerStubs64.java | 0 .../xposedcompat/methodgen/ErrorCatch.java | 0 .../xposedcompat/methodgen/HookMaker.java | 0 .../methodgen/HookerDexMaker.java | 2 +- .../methodgen/HookerDexMakerNew.java | 2 +- .../methodgen/SandHookXposedBridge.java | 14 +- .../xposedcompat/utils/ApplicationUtils.java | 0 .../sandhook/xposedcompat/utils/DexLog.java | 2 +- .../xposedcompat/utils/DexMakerUtils.java | 4 +- .../src/main/java/pxb/android/ResConst.java | 0 .../src/main/java/pxb/android/StringItem.java | 0 .../main/java/pxb/android/StringItems.java | 0 .../java/pxb/android/arsc/ArscDumper.java | 0 .../java/pxb/android/arsc/ArscParser.java | 0 .../java/pxb/android/arsc/ArscWriter.java | 0 .../main/java/pxb/android/arsc/BagValue.java | 0 .../main/java/pxb/android/arsc/Config.java | 0 .../src/main/java/pxb/android/arsc/Pkg.java | 0 .../main/java/pxb/android/arsc/ResEntry.java | 0 .../main/java/pxb/android/arsc/ResSpec.java | 0 .../src/main/java/pxb/android/arsc/Type.java | 0 .../src/main/java/pxb/android/arsc/Value.java | 0 .../src/main/java/pxb/android/axml/Axml.java | 0 .../java/pxb/android/axml/AxmlParser.java | 0 .../java/pxb/android/axml/AxmlReader.java | 0 .../java/pxb/android/axml/AxmlVisitor.java | 0 .../java/pxb/android/axml/AxmlWriter.java | 0 .../java/pxb/android/axml/DumpAdapter.java | 0 .../java/pxb/android/axml/NodeVisitor.java | 0 .../src/main/java/pxb/android/axml/Util.java | 0 .../java/pxb/android/axml/ValueWrapper.java | 0 .../src/main/java/pxb/android/package.html | 0 .../template_override/LSPosed.apk | Bin .../META-INF/com/google/android/update-binary | 0 .../com/google/android/updater-script | 0 .../template_override/README.md | 28 +-- .../template_override/customize.sh | 82 ++++---- .../template_override/post-fs-data.sh | 32 +-- .../template_override/sepolicy.rule | 0 .../template_override/service.sh | 0 .../template_override/system.prop | 0 core/template_override/uninstall.sh | 27 +++ .../template_override/util_functions.sh | 8 +- .../template_override/verify.sh | 0 .../template_override/zh_CN.sh | 4 +- {edxp-core => core}/tpl/module.prop.tpl | 0 .../EdXposedUninstaller_rec-v3.zip | Bin 2575 -> 0 bytes .../META-INF/com/google/android/update-binary | 194 ------------------ .../com/google/android/updater-script | 1 - edxp-core/src/main/AndroidManifest.xml | 1 - edxp-core/src/main/cpp/external/Dobby | 1 - .../com/elderdrivers/riru/common/KeepAll.java | 4 - .../elderdrivers/riru/common/KeepMembers.java | 4 - .../riru/edxp/yahfa/core/YahfaRouter.java | 21 -- edxp-core/template_override/uninstall.sh | 27 --- key-selector/src/main/AndroidManifest.xml | 2 +- key-selector/src/main/cpp/Languages.h | 6 +- sandhook-hooklib/build.gradle | 4 +- sandhook-hooklib/src/main/cpp/CMakeLists.txt | 2 +- settings.gradle | 2 +- 781 files changed, 737 insertions(+), 933 deletions(-) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/App.java (93%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/Constants.java (97%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/adapters/AppAdapter.java (98%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/adapters/AppHelper.java (96%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/adapters/BlackListAdapter.java (87%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/adapters/ScopeAdapter.java (91%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/receivers/EdServiceReceiver.java (87%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/activity/AboutActivity.java (80%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/activity/AppListActivity.java (91%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/activity/BaseActivity.java (95%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/activity/CrashReportActivity.java (94%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/activity/LogsActivity.java (95%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/activity/MainActivity.java (89%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/activity/ModulesActivity.java (97%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/activity/SettingsActivity.java (97%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/fragment/CompileDialogFragment.java (96%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/fragment/StatusDialogBuilder.java (96%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/widget/IntegerListPreference.java (97%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/widget/MasterSwitch.java (97%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/widget/RecyclerViewBugFixed.java (98%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/ui/widget/ThemeColorPreference.java (91%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/CompileUtil.java (96%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/CustomThemeColor.java (87%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/CustomThemeColors.java (98%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/GlideHelper.java (89%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/IconLoader.java (90%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/LinearLayoutManagerFix.java (95%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/ModuleUtil.java (98%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/NavUtil.java (89%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/NotificationUtil.java (97%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/RebootUtil.java (96%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/Singleton.java (86%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/ToastUtil.java (93%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/light/Hack.java (99%) rename app/src/main/java/{org/meowcat/edxposed => io/github/lsposed}/manager/util/light/Light.java (97%) rename {edxp-core => core}/.gitignore (100%) rename {edxp-core => core}/build.gradle (96%) rename {edxp-core => core}/proguard-rules.pro (76%) create mode 100644 core/src/main/AndroidManifest.xml rename {edxp-core => core}/src/main/cpp/CMakeLists.txt (100%) rename {edxp-core => core}/src/main/cpp/external/CMakeLists.txt (100%) rename {edxp-core => core}/src/main/cpp/external/android/CMakeLists.txt (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/file.cpp (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/file.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/logging.cpp (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/logging.h (99%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/macros.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/off64_t.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/parseint.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/strings.cpp (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/strings.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/thread_annotations.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/threads.cpp (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/threads.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/unique_fd.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/android-base/utf8.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/android/fdsan.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/art/base/macros.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/art/runtime/native/native_util.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/nativehelper/jni_macros.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/nativehelper/module_api.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/nativehelper/nativehelper_utils.h (100%) rename {edxp-core => core}/src/main/cpp/external/android/nativehelper/scoped_local_ref.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/CMakeLists.txt (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/include/xhook.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/queue.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/tree.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_core.c (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_core.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_elf.c (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_elf.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_errno.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_jni.c (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_log.c (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_log.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_util.c (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_util.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_version.c (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xh_version.h (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xhook.c (100%) rename {edxp-core => core}/src/main/cpp/external/xhook/src/xhook.h (100%) rename {edxp-core => core}/src/main/cpp/external/yahfa/CMakeLists.txt (100%) rename {edxp-core => core}/src/main/cpp/external/yahfa/include/HookMain.h (100%) rename {edxp-core => core}/src/main/cpp/external/yahfa/include/trampoline.h (100%) rename {edxp-core => core}/src/main/cpp/external/yahfa/src/HookMain.c (100%) rename {edxp-core => core}/src/main/cpp/external/yahfa/src/common.h (96%) rename {edxp-core => core}/src/main/cpp/external/yahfa/src/trampoline.c (100%) rename {edxp-core => core}/src/main/cpp/main/CMakeLists.txt (64%) rename {edxp-core => core}/src/main/cpp/main/include/ByteOrder.h (89%) rename {edxp-core => core}/src/main/cpp/main/include/JNIHelper.h (100%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/art_method.h (86%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/class_linker.h (89%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/gc/collector/gc_type.h (100%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/gc/gc_cause.h (100%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/gc/heap.h (88%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/hidden_api.h (84%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/instrumentation.h (77%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/jni_env_ext.h (95%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/mirror/class.h (96%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/reflection.h (84%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/runtime.h (95%) rename {edxp-core => core}/src/main/cpp/main/include/art/runtime/thread.h (91%) rename {edxp-core => core}/src/main/cpp/main/include/base/object.h (94%) rename {edxp-core => core}/src/main/cpp/main/include/config.h (84%) rename {edxp-core => core}/src/main/cpp/main/include/dl_util.h (94%) rename {edxp-core => core}/src/main/cpp/main/include/framework/androidfw/ResourceTypes.h (100%) rename {edxp-core => core}/src/main/cpp/main/include/logging.h (96%) rename {edxp-core => core}/src/main/cpp/main/include/native_util.h (92%) rename {edxp-core => core}/src/main/cpp/main/include/utils.h (99%) rename {edxp-core => core}/src/main/cpp/main/src/config_manager.cpp (98%) rename {edxp-core => core}/src/main/cpp/main/src/config_manager.h (92%) rename edxp-core/src/main/cpp/main/src/edxp_context.cpp => core/src/main/cpp/main/src/context.cpp (97%) rename edxp-core/src/main/cpp/main/src/edxp_context.h => core/src/main/cpp/main/src/context.h (99%) rename {edxp-core => core}/src/main/cpp/main/src/jni/art_class_linker.cpp (98%) rename {edxp-core => core}/src/main/cpp/main/src/jni/art_class_linker.h (61%) rename {edxp-core => core}/src/main/cpp/main/src/jni/art_heap.cpp (86%) rename {edxp-core => core}/src/main/cpp/main/src/jni/art_heap.h (58%) rename edxp-core/src/main/cpp/main/src/jni/edxp_config_manager.cpp => core/src/main/cpp/main/src/jni/config_manager.cpp (94%) rename edxp-core/src/main/cpp/main/src/jni/edxp_config_manager.h => core/src/main/cpp/main/src/jni/config_manager.h (83%) rename edxp-core/src/main/cpp/main/src/jni/edxp_pending_hooks.cpp => core/src/main/cpp/main/src/jni/pending_hooks.cpp (96%) rename edxp-core/src/main/cpp/main/src/jni/edxp_pending_hooks.h => core/src/main/cpp/main/src/jni/pending_hooks.h (83%) rename edxp-core/src/main/cpp/main/src/jni/edxp_resources_hook.cpp => core/src/main/cpp/main/src/jni/resources_hook.cpp (89%) rename edxp-core/src/main/cpp/main/src/jni/edxp_resources_hook.h => core/src/main/cpp/main/src/jni/resources_hook.h (78%) rename edxp-core/src/main/cpp/main/src/jni/edxp_yahfa.cpp => core/src/main/cpp/main/src/jni/yahfa.cpp (86%) rename edxp-core/src/main/cpp/main/src/jni/edxp_yahfa.h => core/src/main/cpp/main/src/jni/yahfa.h (66%) rename {edxp-core => core}/src/main/cpp/main/src/main.cpp (90%) rename {edxp-core => core}/src/main/cpp/main/src/native_hook.cpp (99%) rename {edxp-core => core}/src/main/cpp/main/src/native_hook.h (80%) rename {edxp-core => core}/src/main/cpp/main/src/resource_hook.cpp (99%) rename {edxp-core => core}/src/main/cpp/main/src/resource_hook.h (94%) rename {edxp-core => core}/src/main/cpp/main/src/riru_hook.cpp (97%) rename {edxp-core => core}/src/main/cpp/main/src/riru_hook.h (98%) rename {edxp-core => core}/src/main/cpp/main/src/rirud_socket.cpp (100%) rename {edxp-core => core}/src/main/cpp/main/src/rirud_socket.h (100%) rename {edxp-core => core}/src/main/java/android/app/AndroidAppHelper.java (100%) rename {edxp-core => core}/src/main/java/android/app/package-info.java (100%) rename {edxp-core => core}/src/main/java/android/content/res/XModuleResources.java (100%) rename {edxp-core => core}/src/main/java/android/content/res/XResForwarder.java (100%) rename {edxp-core => core}/src/main/java/android/content/res/XResources.java (100%) rename {edxp-core => core}/src/main/java/android/content/res/package-info.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/DexCreator.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/IModuleContext.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/IXposedHookCmdInit.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/IXposedHookInitPackageResources.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/IXposedHookLoadPackage.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/IXposedHookZygoteInit.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/IXposedMod.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/LspHooker.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/PendingHooks.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/SELinuxHelper.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/XC_MethodHook.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/XC_MethodReplacement.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/XSharedPreferences.java (99%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/XposedBridge.java (97%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/XposedHelpers.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/XposedInit.java (99%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/annotation/ApiSensitive.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/annotation/Level.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/callbacks/IXUnhook.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/callbacks/XC_InitZygote.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/callbacks/XC_LayoutInflated.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/callbacks/XCallback.java (97%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/callbacks/package-info.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/package-info.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/services/BaseService.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/services/BinderService.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/services/DirectAccessService.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/services/FileResult.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/services/ZygoteService.java (100%) rename {edxp-core => core}/src/main/java/de/robv/android/xposed/services/package-info.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/Annotation.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/CallSiteId.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/ClassData.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/ClassDef.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/Code.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/Dex.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/DexException.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/DexFormat.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/DexIndexOverflowException.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/EncodedValue.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/EncodedValueCodec.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/EncodedValueReader.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/FieldId.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/Leb128.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/MethodHandle.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/MethodId.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/Mutf8.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/ProtoId.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/SizeOf.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/TableOfContents.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/TypeList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/util/ByteArrayByteInput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/util/ByteInput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/util/ByteOutput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/util/ExceptionWithContext.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/util/FileUtils.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dex/util/Unsigned.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/AnnotationId.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/AppDataDirGuesser.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/BinaryOp.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/Code.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/Comparison.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/Constants.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/DexMaker.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/FieldId.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/Label.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/Local.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/MethodId.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/TypeId.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/TypeList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/UnaryOp.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/Version.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttAnnotationDefault.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttBootstrapMethods.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttCode.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttConstantValue.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttDeprecated.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttEnclosingMethod.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttExceptions.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttInnerClasses.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttLineNumberTable.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTable.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTypeTable.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleAnnotations.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttSignature.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttSourceDebugExtension.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttSourceFile.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/AttSynthetic.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/BaseAnnotations.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/BaseAttribute.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/BaseLocalVariables.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/BaseParameterAnnotations.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/InnerClassList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/RawAttribute.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/attrib/package.html (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/BaseMachine.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/BasicBlocker.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/BootstrapMethodArgumentsList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/BootstrapMethodsList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/ByteBlock.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/ByteBlockList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/ByteCatchList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/ByteOps.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/BytecodeArray.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/ConcreteMethod.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/ExecutionStack.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/Frame.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/LineNumberList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/LocalVariableList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/LocalsArray.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/LocalsArraySet.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/Machine.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/Merger.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/OneLocalsArray.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/ReturnAddress.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/Ropper.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/RopperMachine.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/SimException.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/Simulator.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/SwitchList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/ValueAwareMachine.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/code/package.html (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/cst/ConstantPoolParser.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/cst/ConstantTags.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/cst/MethodHandleKind.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/AnnotationParser.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/AttributeFactory.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/AttributeListParser.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/ClassPathOpener.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/CodeObserver.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/DirectClassFile.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/FieldListParser.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/MemberListParser.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/MethodListParser.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/StdAttributeFactory.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/direct/package.html (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/Attribute.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/AttributeList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/ClassFile.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/Field.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/FieldList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/HasAttribute.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/Member.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/Method.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/MethodList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/ParseException.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/ParseObserver.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/StdAttributeList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/StdField.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/StdFieldList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/StdMember.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/StdMethod.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/StdMethodList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/cf/iface/package.html (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/Main.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/UsageException.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/annotool/AnnotationLister.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/annotool/Main.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/dexer/DxContext.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/dexer/Main.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/dump/Args.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/dump/BaseDumper.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/dump/BlockDumper.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/dump/ClassDumper.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/dump/DotDumper.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/dump/Main.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/dump/SsaDumper.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/findusages/FindUsages.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/findusages/Main.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/grep/Grep.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/command/grep/Main.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/DexOptions.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/cf/AttributeTranslator.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/cf/CfOptions.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/cf/CfTranslator.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/cf/CodeStatistics.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/cf/OptimizerOptions.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/cf/package.html (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/ArrayData.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/BlockAddresses.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/CatchBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/CatchHandlerList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/CatchTable.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/CodeAddress.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/CstInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/DalvCode.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/DalvInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/DalvInsnList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/Dop.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/Dops.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/FixedSizeInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/HighRegisterPrefix.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/InsnFormat.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/LocalList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/LocalSnapshot.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/LocalStart.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/MultiCstInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/OddSpacer.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/OutputCollector.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/OutputFinisher.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/PositionList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/RopToDop.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/RopTranslator.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/SimpleInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/StdCatchBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/SwitchData.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/TargetInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/VariableSizeInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/ZeroSizeInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form10t.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form10x.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form11n.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form11x.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form12x.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form20t.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form21c.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form21h.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form21s.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form21t.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form22b.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form22c.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form22s.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form22t.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form22x.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form23x.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form30t.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form31c.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form31i.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form31t.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form32x.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form35c.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form3rc.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form45cc.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form4rcc.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/Form51l.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/code/form/SpecialFormat.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/AnnotationItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/AnnotationSetItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/AnnotationSetRefItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/AnnotationUtils.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/AnnotationsDirectoryItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/CallSiteIdItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/CallSiteIdsSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/CallSiteItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/CatchStructs.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/ClassDataItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/ClassDefItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/ClassDefsSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/CodeItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/DebugInfoConstants.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/DebugInfoDecoder.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/DebugInfoEncoder.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/DebugInfoItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/DexFile.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/EncodedArrayItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/EncodedField.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/EncodedMember.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/EncodedMethod.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/FieldAnnotationStruct.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/FieldIdItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/FieldIdsSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/HeaderItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/HeaderSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/IdItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/IndexedItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/Item.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/ItemType.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/MapItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/MemberIdItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/MemberIdsSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/MethodAnnotationStruct.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/MethodHandleItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/MethodHandlesSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/MethodIdItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/MethodIdsSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/MixedItemSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/OffsettedItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/ParameterAnnotationStruct.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/ProtoIdItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/ProtoIdsSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/Section.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/Statistics.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/StringDataItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/StringIdItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/StringIdsSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/TypeIdItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/TypeIdsSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/TypeListItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/UniformItemSection.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/UniformListItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/dex/file/ValueEncoder.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/CodeReader.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/DexIndexPrinter.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/IndexType.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/OpcodeInfo.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/Opcodes.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/AddressMap.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/BaseCodeCursor.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/CodeCursor.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/CodeInput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/CodeOutput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/DecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/InstructionCodec.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicRangeDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeInput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeOutput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/merge/CollisionPolicy.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/merge/DexMerger.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/merge/IndexMap.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/merge/InstructionTransformer.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/merge/SortableType.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/annotation/Annotation.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/annotation/AnnotationVisibility.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/annotation/Annotations.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/annotation/AnnotationsList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/annotation/NameValuePair.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/AccessFlags.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/BasicBlock.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/BasicBlockList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/ConservativeTranslationAdvice.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/CstInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/DexTranslationAdvice.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/Exceptions.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/FillArrayDataInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/Insn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/InsnList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/InvokePolymorphicInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/LocalItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/LocalVariableExtractor.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/LocalVariableInfo.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/PlainCstInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/PlainInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/RegOps.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/RegisterSpec.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/RegisterSpecList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/RegisterSpecSet.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/Rop.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/RopMethod.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/Rops.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/SourcePosition.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/SwitchInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/ThrowingCstInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/ThrowingInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/TranslationAdvice.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/code/package.html (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/Constant.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/ConstantPool.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstAnnotation.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstArray.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstBaseMethodRef.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstBoolean.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstByte.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstCallSite.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstCallSiteRef.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstChar.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstDouble.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstEnumRef.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstFieldRef.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstFloat.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstInteger.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstInterfaceMethodRef.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstInvokeDynamic.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstKnownNull.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstLiteral32.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstLiteral64.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstLiteralBits.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstLong.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstMemberRef.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstMethodHandle.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstMethodRef.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstNat.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstProtoRef.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstShort.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstString.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/CstType.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/StdConstantPool.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/TypedConstant.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/Zeroes.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/cst/package.html (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/package-info.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/type/Prototype.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/type/StdTypeList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/type/Type.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/type/TypeBearer.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/type/TypeList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/rop/type/package.html (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/BasicRegisterMapper.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/ConstCollector.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/DeadCodeRemover.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/DomFront.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/Dominators.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/EscapeAnalysis.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/InterferenceRegisterMapper.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/LiteralOpUpgrader.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/LocalVariableExtractor.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/LocalVariableInfo.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/MoveParamCombiner.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/NormalSsaInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/Optimizer.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/PhiInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/PhiTypeResolver.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/RegisterMapper.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/SCCP.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/SetFactory.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/SsaBasicBlock.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/SsaConverter.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/SsaInsn.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/SsaMethod.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/SsaRenamer.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/back/FirstFitAllocator.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/back/IdenticalBlockCombiner.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/back/InterferenceGraph.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/back/LivenessAnalyzer.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/back/NullRegisterAllocator.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/back/RegisterAllocator.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/back/SsaToRop.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/ssa/package-info.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/stock/ProxyBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/AnnotatedOutput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/BitIntSet.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/Bits.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/ByteArray.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/ByteArrayAnnotatedOutput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/FixedSizeList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/Hex.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/HexParser.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/IndentingWriter.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/IntIterator.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/IntList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/IntSet.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/LabeledItem.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/LabeledList.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/ListIntSet.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/MutabilityControl.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/MutabilityException.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/Output.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/ToHuman.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/TwoColumnOutput.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/Warning.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/Writers.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/dx/util/package.html (100%) rename {edxp-core => core}/src/main/java/external/com/android/multidex/ArchivePathElement.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/multidex/ClassPathElement.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/multidex/ClassReferenceListBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/multidex/FolderPathElement.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/multidex/MainDexListBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/com/android/multidex/Path.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/ArrayUtils.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/CharSequenceUtils.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/CharUtils.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/ClassUtils.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/JavaVersion.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/LICENSE.txt (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/MODIFICATIONS.txt (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/NOTICE.txt (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/ObjectUtils.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/RELEASE-NOTES.txt (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/StringUtils.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/SystemUtils.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/Validate.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/builder/Builder.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/builder/CompareToBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/builder/EqualsBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/builder/HashCodeBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/builder/IDKey.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/builder/ToStringBuilder.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/builder/ToStringStyle.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/builder/package.html (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/exception/CloneFailedException.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/exception/package.html (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/mutable/Mutable.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/mutable/MutableInt.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/mutable/package.html (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/overview.html (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/package.html (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/reflect/MemberUtils.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/reflect/MethodUtils.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/reflect/package.html (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/tuple/ImmutablePair.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/tuple/Pair.java (100%) rename {edxp-core => core}/src/main/java/external/org/apache/commons/lang3/tuple/package.html (100%) create mode 100644 core/src/main/java/io/github/lsposed/common/KeepAll.java create mode 100644 core/src/main/java/io/github/lsposed/common/KeepMembers.java rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/_hooker/impl/HandleBindApp.java (96%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/_hooker/impl/LoadedApkCstr.java (95%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/_hooker/impl/LoadedApkGetCL.java (91%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/_hooker/impl/StartBootstrapServices.java (93%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/_hooker/impl/SystemMain.java (82%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/art/ClassLinker.java (81%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/art/Heap.java (65%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/config/BaseHookProvider.java (83%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/config/ConfigManager.java (94%) rename edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/EdXpConfigGlobal.java => core/src/main/java/io/github/lsposed/lspd/config/LSPdConfigGlobal.java (68%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/core/BaseEdxpImpl.java (85%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/core/EdxpImpl.java (80%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/core/Main.java (69%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/core/Proxy.java (89%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/core/ResourcesHook.java (79%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/core/Yahfa.java (92%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/core/yahfa/HookMain.java (95%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/deopt/InlinedMethodCallers.java (98%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/deopt/PrebuiltMethodsDeopter.java (70%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/framework/Zygote.java (86%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/hook/HookProvider.java (94%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/hooker/XposedInstallerHooker.java (72%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/proxy/BaseProxy.java (80%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/proxy/BaseRouter.java (89%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/proxy/NormalProxy.java (86%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/proxy/Router.java (90%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/config/SandHookProvider.java (88%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/core/SandHookEdxpImpl.java (53%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/core/SandHookRouter.java (68%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/entry/AppBootstrapHookInfo.java (58%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/entry/SysBootstrapHookInfo.java (57%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/entry/SysInnerHookInfo.java (58%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/hooker/HandleBindAppHooker.java (91%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/hooker/LoadedApkConstructorHooker.java (94%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/hooker/StartBootstrapServicesHooker.java (89%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/hooker/StartBootstrapServicesHooker11.java (91%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/sandhook/hooker/SystemMainHooker.java (90%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/service/PackageReceiver.java (95%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/service/ServiceProxy.java (95%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/ClassLoaderUtils.java (97%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/ClassUtils.java (97%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/DexUtils.java (98%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/FileUtils.java (95%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/Hookers.java (92%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/MetaDataReader.java (98%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/ProcessUtils.java (98%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/ProxyClassLoader.java (94%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/Unsafe.java (98%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/Utils.java (91%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/util/Versions.java (86%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/yahfa/config/YahfaHookProvider.java (75%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/yahfa/core/YahfaEdxpImpl.java (51%) create mode 100644 core/src/main/java/io/github/lsposed/lspd/yahfa/core/YahfaRouter.java rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/yahfa/dexmaker/DexLog.java (79%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/yahfa/dexmaker/DexMakerUtils.java (98%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/yahfa/dexmaker/DynamicBridge.java (98%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/yahfa/dexmaker/HookerDexMaker.java (94%) rename {edxp-core/src/main/java/com/elderdrivers/riru/edxp => core/src/main/java/io/github/lsposed/lspd}/yahfa/dexmaker/MethodInfo.java (98%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/XposedCompat.java (91%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/hookstub/CallOriginCallBack.java (100%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/hookstub/HookMethodEntity.java (100%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/hookstub/HookStubManager.java (99%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs32.java (100%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs64.java (100%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/methodgen/ErrorCatch.java (100%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/methodgen/HookMaker.java (100%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/methodgen/HookerDexMaker.java (99%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/methodgen/HookerDexMakerNew.java (99%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/methodgen/SandHookXposedBridge.java (95%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/utils/ApplicationUtils.java (100%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/utils/DexLog.java (95%) rename {edxp-core/src/main/java/com => core/src/main/java/io}/swift/sandhook/xposedcompat/utils/DexMakerUtils.java (99%) rename {edxp-core => core}/src/main/java/pxb/android/ResConst.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/StringItem.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/StringItems.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/ArscDumper.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/ArscParser.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/ArscWriter.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/BagValue.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/Config.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/Pkg.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/ResEntry.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/ResSpec.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/Type.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/arsc/Value.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/axml/Axml.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/axml/AxmlParser.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/axml/AxmlReader.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/axml/AxmlVisitor.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/axml/AxmlWriter.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/axml/DumpAdapter.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/axml/NodeVisitor.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/axml/Util.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/axml/ValueWrapper.java (100%) rename {edxp-core => core}/src/main/java/pxb/android/package.html (100%) rename edxp-core/template_override/EdXposed.apk => core/template_override/LSPosed.apk (100%) rename {edxp-core => core}/template_override/META-INF/com/google/android/update-binary (100%) rename {edxp-core => core}/template_override/META-INF/com/google/android/updater-script (100%) rename {edxp-core => core}/template_override/README.md (55%) rename {edxp-core => core}/template_override/customize.sh (77%) rename {edxp-core => core}/template_override/post-fs-data.sh (82%) rename {edxp-core => core}/template_override/sepolicy.rule (100%) rename {edxp-core => core}/template_override/service.sh (100%) rename {edxp-core => core}/template_override/system.prop (100%) create mode 100644 core/template_override/uninstall.sh rename {edxp-core => core}/template_override/util_functions.sh (92%) rename {edxp-core => core}/template_override/verify.sh (100%) rename {edxp-core => core}/template_override/zh_CN.sh (93%) rename {edxp-core => core}/tpl/module.prop.tpl (100%) delete mode 100644 edxp-core/misc/EdXposedUninstaller/EdXposedUninstaller_rec-v3.zip delete mode 100644 edxp-core/misc/EdXposedUninstaller/META-INF/com/google/android/update-binary delete mode 100644 edxp-core/misc/EdXposedUninstaller/META-INF/com/google/android/updater-script delete mode 100644 edxp-core/src/main/AndroidManifest.xml delete mode 160000 edxp-core/src/main/cpp/external/Dobby delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/common/KeepAll.java delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/common/KeepMembers.java delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/YahfaRouter.java delete mode 100644 edxp-core/template_override/uninstall.sh diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 3695a1a9..354f09dc 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -40,6 +40,6 @@ LSPposed: **相关日志/Related Logs** diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index e64126ed..f4087d45 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -33,8 +33,8 @@ jobs: run: bash ./gradlew zipRelease zipDebug :app:assembleRelease - name: Prepare artifact if: success() - run: unzip edxp-core/release/LSPosed-v*-release.zip -d LSPosed-release; - unzip edxp-core/release/LSPosed-v*-debug.zip -d LSPosed-debug; + run: unzip lspd-core/release/LSPosed-v*-release.zip -d LSPosed-release; + unzip lspd-core/release/LSPosed-v*-debug.zip -d LSPosed-debug; - name: Upload release uses: actions/upload-artifact@v2 with: @@ -51,7 +51,7 @@ jobs: CHANNEL_ID: ${{ secrets.CHANNEL_ID }} BOT_TOKEN: ${{ secrets.BOT_TOKEN }} run: | - OUTPUT="edxp-core/release/" + OUTPUT="lspd-core/release/" export release=$(find $OUTPUT -name "LSPosed-v*-release.zip") export debug=$(find $OUTPUT -name "LSPosed-v*-debug.zip") curl -v "https://api.telegram.org/bot${BOT_TOKEN}/sendMediaGroup?chat_id=${CHANNEL_ID}&media=%5B%7B%22type%22:%22document%22,%20%22media%22:%22attach://release%22%7D,%7B%22type%22:%22document%22,%20%22media%22:%22attach://debug%22%7D%5D" -F release="@$release" -F debug="@$debug" diff --git a/.gitmodules b/.gitmodules index 3448c611..41adb223 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "edxp-core/src/main/cpp/external/Dobby"] - path = edxp-core/src/main/cpp/external/Dobby +[submodule "core/src/main/cpp/external/Dobby"] + path = core/src/main/cpp/external/Dobby url = https://github.com/jmpews/Dobby.git diff --git a/README.md b/README.md index 33c2da64..eeff2148 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Android 8.1+ 1. Install Magisk v21+ 2. Install [Riru](https://github.com/RikkaApps/Riru/releases) v23+ from Magisk repo. -3. [Download](#download) and install EdXposed in Magisk Manager +3. [Download](#download) and install LSPosed in Magisk Manager 4. Install LSPosed Manager 4. Reboot. 5. Have fun! :) @@ -26,7 +26,7 @@ Android 8.1+ You can download LSPosed framework and LSPosed Manager from Github Action or Github Release ## Useful Links -- [List of Xposed Modules For Android Pie Working With EdXposed](https://forum.xda-developers.com/xposed/list-xposed-modules-android-pie-ed-t3892768) (thanks to Uraniam9 @ xda-developers) +- [List of Xposed Modules For Android Pie Working With LSPosed](https://forum.xda-developers.com/xposed/list-xposed-modules-android-pie-ed-t3892768) (thanks to Uraniam9 @ xda-developers) ## Get Help @@ -34,11 +34,11 @@ You can download LSPosed framework and LSPosed Manager from Github Action or Git ## For Developers -Developers are welcomed to write Xposed modules with hooks based on EdXposed Framework. Module written based on EdXposed framework is fully compatible with the original Xposed Framework, so contrary a Xposed Framework-based module will work well with the EdXposed framework too. +Developers are welcomed to write Xposed modules with hooks based on LSPosed Framework. Module written based on LSPosed framework is fully compatible with the original Xposed Framework, so contrary a Xposed Framework-based module will work well with the LSPosed framework too. - [Xposed Framework API](https://api.xposed.info/) -We use the module repository of the original Xposed, so you simply upload the module to repository, then you can download your module in EdXposed. +We use the module repository of the original Xposed, so you simply upload the module to repository, then you can download your module in LSPosed. - [Xposed Module Repository](https://repo.xposed.info/) @@ -57,4 +57,4 @@ Notice: These community group don't accept any bug report, please use [Get help] - [dexmaker](https://github.com/linkedin/dexmaker) and [dalvikdx](https://github.com/JakeWharton/dalvik-dx): to dynamiclly generate YAHFA hooker classes - [SandHook](https://github.com/ganyao114/SandHook/): ART hooking framework for SandHook variant - [Dobby](https://github.com/jmpews/Dobby): used for inline hooking -- [EdXposed](https://github.com/ElderDrivers/EdXposed): fork source +- [LSPosed](https://github.com/ElderDrivers/LSPosed): fork source diff --git a/app/build.gradle b/app/build.gradle index edc0c1d7..0e342f9c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { } defaultConfig { - applicationId "org.meowcat.edxposed.manager" + applicationId "io.github.lsposed.manager" minSdkVersion androidMinSdkVersion.toInteger() targetSdkVersion androidTargetSdkVersion.toInteger() versionCode rootProject.ext.versionCode diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 5f3c6e51..2b793c03 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -19,5 +19,5 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile --keep class org.meowcat.edxposed.manager.util.json.** {public *; } --keep class org.meowcat.edxposed.manager.Constants { *; } \ No newline at end of file +-keep class io.github.lsposed.manager.util.json.** {public *; } +-keep class io.github.lsposed.manager.Constants { *; } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bb07c351..68cc957f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="io.github.lsposed.manager"> diff --git a/app/src/main/java/org/meowcat/edxposed/manager/App.java b/app/src/main/java/io/github/lsposed/manager/App.java similarity index 93% rename from app/src/main/java/org/meowcat/edxposed/manager/App.java rename to app/src/main/java/io/github/lsposed/manager/App.java index 3d49711f..83ff47f2 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/App.java +++ b/app/src/main/java/io/github/lsposed/manager/App.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager; +package io.github.lsposed.manager; import android.annotation.SuppressLint; import android.app.Application; @@ -9,10 +9,10 @@ import android.os.Looper; import androidx.preference.PreferenceManager; -import org.meowcat.edxposed.manager.ui.activity.CrashReportActivity; -import org.meowcat.edxposed.manager.util.CompileUtil; -import org.meowcat.edxposed.manager.util.NotificationUtil; -import org.meowcat.edxposed.manager.util.RebootUtil; +import io.github.lsposed.manager.ui.activity.CrashReportActivity; +import io.github.lsposed.manager.util.CompileUtil; +import io.github.lsposed.manager.util.NotificationUtil; +import io.github.lsposed.manager.util.RebootUtil; import java.io.File; import java.io.PrintWriter; @@ -24,7 +24,7 @@ import rikka.sui.Sui; import static android.content.pm.PackageManager.PERMISSION_GRANTED; public class App extends Application { - public static final String TAG = "EdXposedManager"; + public static final String TAG = "LSPosedManager"; @SuppressLint("StaticFieldLeak") private static App instance = null; private static Thread uiThread; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/Constants.java b/app/src/main/java/io/github/lsposed/manager/Constants.java similarity index 97% rename from app/src/main/java/org/meowcat/edxposed/manager/Constants.java rename to app/src/main/java/io/github/lsposed/manager/Constants.java index a52ee060..42933a33 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/Constants.java +++ b/app/src/main/java/io/github/lsposed/manager/Constants.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager; +package io.github.lsposed.manager; import android.util.Log; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java b/app/src/main/java/io/github/lsposed/manager/adapters/AppAdapter.java similarity index 98% rename from app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java rename to app/src/main/java/io/github/lsposed/manager/adapters/AppAdapter.java index eccaa065..1e4998c4 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java +++ b/app/src/main/java/io/github/lsposed/manager/adapters/AppAdapter.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.adapters; +package io.github.lsposed.manager.adapters; import android.annotation.SuppressLint; import android.content.SharedPreferences; @@ -29,10 +29,10 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.ui.activity.AppListActivity; -import org.meowcat.edxposed.manager.util.GlideApp; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.ui.activity.AppListActivity; +import io.github.lsposed.manager.util.GlideApp; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java b/app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java similarity index 96% rename from app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java rename to app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java index 44a1adaa..5208192f 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java +++ b/app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.adapters; +package io.github.lsposed.manager.adapters; import android.app.ActivityManager; import android.content.Context; @@ -12,10 +12,10 @@ import androidx.annotation.NonNull; import androidx.appcompat.widget.PopupMenu; import androidx.fragment.app.FragmentManager; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.Constants; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.util.CompileUtil; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.Constants; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.util.CompileUtil; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java b/app/src/main/java/io/github/lsposed/manager/adapters/BlackListAdapter.java similarity index 87% rename from app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java rename to app/src/main/java/io/github/lsposed/manager/adapters/BlackListAdapter.java index d65bf369..4adfe68f 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java +++ b/app/src/main/java/io/github/lsposed/manager/adapters/BlackListAdapter.java @@ -1,12 +1,12 @@ -package org.meowcat.edxposed.manager.adapters; +package io.github.lsposed.manager.adapters; import android.content.pm.ApplicationInfo; import android.widget.CompoundButton; import com.google.android.material.snackbar.Snackbar; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.ui.activity.AppListActivity; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.ui.activity.AppListActivity; import java.util.List; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/ScopeAdapter.java b/app/src/main/java/io/github/lsposed/manager/adapters/ScopeAdapter.java similarity index 91% rename from app/src/main/java/org/meowcat/edxposed/manager/adapters/ScopeAdapter.java rename to app/src/main/java/io/github/lsposed/manager/adapters/ScopeAdapter.java index 5314c4f6..f433fcf2 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/ScopeAdapter.java +++ b/app/src/main/java/io/github/lsposed/manager/adapters/ScopeAdapter.java @@ -1,13 +1,13 @@ -package org.meowcat.edxposed.manager.adapters; +package io.github.lsposed.manager.adapters; import android.content.pm.ApplicationInfo; import android.widget.CompoundButton; import com.google.android.material.snackbar.Snackbar; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.ui.activity.AppListActivity; -import org.meowcat.edxposed.manager.ui.widget.MasterSwitch; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.ui.activity.AppListActivity; +import io.github.lsposed.manager.ui.widget.MasterSwitch; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/receivers/EdServiceReceiver.java b/app/src/main/java/io/github/lsposed/manager/receivers/EdServiceReceiver.java similarity index 87% rename from app/src/main/java/org/meowcat/edxposed/manager/receivers/EdServiceReceiver.java rename to app/src/main/java/io/github/lsposed/manager/receivers/EdServiceReceiver.java index 4acd0684..3b192001 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/receivers/EdServiceReceiver.java +++ b/app/src/main/java/io/github/lsposed/manager/receivers/EdServiceReceiver.java @@ -1,12 +1,12 @@ -package org.meowcat.edxposed.manager.receivers; +package io.github.lsposed.manager.receivers; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.net.Uri; -import org.meowcat.edxposed.manager.util.ModuleUtil; -import org.meowcat.edxposed.manager.util.NotificationUtil; +import io.github.lsposed.manager.util.ModuleUtil; +import io.github.lsposed.manager.util.NotificationUtil; public class EdServiceReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AboutActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/AboutActivity.java similarity index 80% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AboutActivity.java rename to app/src/main/java/io/github/lsposed/manager/ui/activity/AboutActivity.java index 0e4d800e..d50ad9de 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AboutActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/AboutActivity.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.activity; +package io.github.lsposed.manager.ui.activity; import android.os.Bundle; import android.view.View; @@ -7,11 +7,11 @@ import androidx.appcompat.app.ActionBar; import com.bumptech.glide.Glide; -import org.meowcat.edxposed.manager.BuildConfig; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.databinding.ActivityAboutBinding; -import org.meowcat.edxposed.manager.util.GlideHelper; -import org.meowcat.edxposed.manager.util.NavUtil; +import io.github.lsposed.manager.BuildConfig; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.databinding.ActivityAboutBinding; +import io.github.lsposed.manager.util.GlideHelper; +import io.github.lsposed.manager.util.NavUtil; public class AboutActivity extends BaseActivity { ActivityAboutBinding binding; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AppListActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/AppListActivity.java similarity index 91% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AppListActivity.java rename to app/src/main/java/io/github/lsposed/manager/ui/activity/AppListActivity.java index fdeabe91..76034579 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AppListActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/AppListActivity.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.activity; +package io.github.lsposed.manager.ui.activity; import android.os.Bundle; import android.os.Handler; @@ -18,13 +18,13 @@ import androidx.recyclerview.widget.DividerItemDecoration; import com.google.android.material.snackbar.Snackbar; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.adapters.AppAdapter; -import org.meowcat.edxposed.manager.adapters.AppHelper; -import org.meowcat.edxposed.manager.adapters.BlackListAdapter; -import org.meowcat.edxposed.manager.adapters.ScopeAdapter; -import org.meowcat.edxposed.manager.databinding.ActivityScopeListBinding; -import org.meowcat.edxposed.manager.util.LinearLayoutManagerFix; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.adapters.AppAdapter; +import io.github.lsposed.manager.adapters.AppHelper; +import io.github.lsposed.manager.adapters.BlackListAdapter; +import io.github.lsposed.manager.adapters.ScopeAdapter; +import io.github.lsposed.manager.databinding.ActivityScopeListBinding; +import io.github.lsposed.manager.util.LinearLayoutManagerFix; import me.zhanghai.android.fastscroll.FastScrollerBuilder; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/BaseActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java similarity index 95% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/activity/BaseActivity.java rename to app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java index e9764363..0c4cf197 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/BaseActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.activity; +package io.github.lsposed.manager.ui.activity; import android.content.Context; import android.content.DialogInterface; @@ -18,12 +18,12 @@ import androidx.core.content.ContextCompat; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.util.CompileUtil; -import org.meowcat.edxposed.manager.util.CustomThemeColor; -import org.meowcat.edxposed.manager.util.CustomThemeColors; -import org.meowcat.edxposed.manager.util.RebootUtil; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.util.CompileUtil; +import io.github.lsposed.manager.util.CustomThemeColor; +import io.github.lsposed.manager.util.CustomThemeColors; +import io.github.lsposed.manager.util.RebootUtil; import java.util.Objects; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/CrashReportActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/CrashReportActivity.java similarity index 94% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/activity/CrashReportActivity.java rename to app/src/main/java/io/github/lsposed/manager/ui/activity/CrashReportActivity.java index d7f8fcf4..0b293bdc 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/CrashReportActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/CrashReportActivity.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.activity; +package io.github.lsposed.manager.ui.activity; import android.content.ClipData; import android.content.ClipboardManager; @@ -14,9 +14,9 @@ import androidx.appcompat.app.AppCompatActivity; import com.google.android.material.snackbar.Snackbar; -import org.meowcat.edxposed.manager.BuildConfig; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.databinding.ActivityCrashReportBinding; +import io.github.lsposed.manager.BuildConfig; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.databinding.ActivityCrashReportBinding; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/LogsActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/LogsActivity.java similarity index 95% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/activity/LogsActivity.java rename to app/src/main/java/io/github/lsposed/manager/ui/activity/LogsActivity.java index 79648c7f..7abcf7b1 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/LogsActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/LogsActivity.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.activity; +package io.github.lsposed.manager.ui.activity; import android.annotation.SuppressLint; import android.content.Intent; @@ -26,13 +26,13 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.snackbar.Snackbar; import com.google.android.material.tabs.TabLayout; -import org.meowcat.edxposed.manager.BuildConfig; -import org.meowcat.edxposed.manager.Constants; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.databinding.ActivityLogsBinding; -import org.meowcat.edxposed.manager.databinding.DialogInstallWarningBinding; -import org.meowcat.edxposed.manager.databinding.ItemLogBinding; -import org.meowcat.edxposed.manager.util.LinearLayoutManagerFix; +import io.github.lsposed.manager.BuildConfig; +import io.github.lsposed.manager.Constants; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.databinding.ActivityLogsBinding; +import io.github.lsposed.manager.databinding.DialogInstallWarningBinding; +import io.github.lsposed.manager.databinding.ItemLogBinding; +import io.github.lsposed.manager.util.LinearLayoutManagerFix; import java.io.File; import java.io.FileInputStream; @@ -189,7 +189,7 @@ public class LogsActivity extends BaseActivity { private void save() { Calendar now = Calendar.getInstance(); String filename = String.format( - "EdXposed_Verbose_%04d%02d%02d_%02d%02d%02d.log", + "LSPosed_Verbose_%04d%02d%02d_%02d%02d%02d.log", now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1, now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY), now.get(Calendar.MINUTE), now.get(Calendar.SECOND)); diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/MainActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java similarity index 89% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/activity/MainActivity.java rename to app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java index e6205552..5f308c88 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/MainActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.activity; +package io.github.lsposed.manager.ui.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -12,15 +12,15 @@ import androidx.core.content.ContextCompat; import com.bumptech.glide.Glide; -import org.meowcat.edxposed.manager.Constants; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.adapters.AppHelper; -import org.meowcat.edxposed.manager.databinding.ActivityMainBinding; -import org.meowcat.edxposed.manager.ui.fragment.StatusDialogBuilder; -import org.meowcat.edxposed.manager.util.GlideHelper; -import org.meowcat.edxposed.manager.util.ModuleUtil; -import org.meowcat.edxposed.manager.util.NavUtil; -import org.meowcat.edxposed.manager.util.light.Light; +import io.github.lsposed.manager.Constants; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.adapters.AppHelper; +import io.github.lsposed.manager.databinding.ActivityMainBinding; +import io.github.lsposed.manager.ui.fragment.StatusDialogBuilder; +import io.github.lsposed.manager.util.GlideHelper; +import io.github.lsposed.manager.util.ModuleUtil; +import io.github.lsposed.manager.util.NavUtil; +import io.github.lsposed.manager.util.light.Light; import java.util.Locale; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/ModulesActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/ModulesActivity.java similarity index 97% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/activity/ModulesActivity.java rename to app/src/main/java/io/github/lsposed/manager/ui/activity/ModulesActivity.java index 60634e3c..a06067e6 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/ModulesActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/ModulesActivity.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.activity; +package io.github.lsposed.manager.ui.activity; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -27,16 +27,16 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.snackbar.Snackbar; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.BuildConfig; -import org.meowcat.edxposed.manager.Constants; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.adapters.AppAdapter; -import org.meowcat.edxposed.manager.databinding.ActivityModulesBinding; -import org.meowcat.edxposed.manager.util.GlideApp; -import org.meowcat.edxposed.manager.util.LinearLayoutManagerFix; -import org.meowcat.edxposed.manager.util.ModuleUtil; -import org.meowcat.edxposed.manager.util.NavUtil; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.BuildConfig; +import io.github.lsposed.manager.Constants; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.adapters.AppAdapter; +import io.github.lsposed.manager.databinding.ActivityModulesBinding; +import io.github.lsposed.manager.util.GlideApp; +import io.github.lsposed.manager.util.LinearLayoutManagerFix; +import io.github.lsposed.manager.util.ModuleUtil; +import io.github.lsposed.manager.util.NavUtil; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/SettingsActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java similarity index 97% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/activity/SettingsActivity.java rename to app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java index 188756d8..94040786 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/SettingsActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.activity; +package io.github.lsposed.manager.ui.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -17,10 +17,10 @@ import androidx.preference.SwitchPreferenceCompat; import com.takisoft.preferencex.PreferenceFragmentCompat; import com.takisoft.preferencex.SimpleMenuPreference; -import org.meowcat.edxposed.manager.Constants; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.databinding.ActivitySettingsBinding; -import org.meowcat.edxposed.manager.ui.widget.IntegerListPreference; +import io.github.lsposed.manager.Constants; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.databinding.ActivitySettingsBinding; +import io.github.lsposed.manager.ui.widget.IntegerListPreference; import java.io.IOException; import java.nio.file.Files; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/CompileDialogFragment.java b/app/src/main/java/io/github/lsposed/manager/ui/fragment/CompileDialogFragment.java similarity index 96% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/CompileDialogFragment.java rename to app/src/main/java/io/github/lsposed/manager/ui/fragment/CompileDialogFragment.java index 6d47d2f9..31115fc4 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/CompileDialogFragment.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/fragment/CompileDialogFragment.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.fragment; +package io.github.lsposed.manager.ui.fragment; import android.app.Dialog; import android.content.Context; @@ -16,11 +16,11 @@ import androidx.appcompat.app.AppCompatDialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.topjohnwu.superuser.Shell; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.databinding.FragmentCompileDialogBinding; -import org.meowcat.edxposed.manager.util.CompileUtil; -import org.meowcat.edxposed.manager.util.ToastUtil; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.databinding.FragmentCompileDialogBinding; +import io.github.lsposed.manager.util.CompileUtil; +import io.github.lsposed.manager.util.ToastUtil; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/StatusDialogBuilder.java b/app/src/main/java/io/github/lsposed/manager/ui/fragment/StatusDialogBuilder.java similarity index 96% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/StatusDialogBuilder.java rename to app/src/main/java/io/github/lsposed/manager/ui/fragment/StatusDialogBuilder.java index 10f2edcf..6d62ce0a 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/fragment/StatusDialogBuilder.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/fragment/StatusDialogBuilder.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.fragment; +package io.github.lsposed.manager.ui.fragment; import android.annotation.SuppressLint; import android.content.Context; @@ -11,11 +11,11 @@ import androidx.core.content.ContextCompat; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.BuildConfig; -import org.meowcat.edxposed.manager.Constants; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.databinding.StatusInstallerBinding; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.BuildConfig; +import io.github.lsposed.manager.Constants; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.databinding.StatusInstallerBinding; import java.io.BufferedReader; import java.io.File; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/widget/IntegerListPreference.java b/app/src/main/java/io/github/lsposed/manager/ui/widget/IntegerListPreference.java similarity index 97% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/widget/IntegerListPreference.java rename to app/src/main/java/io/github/lsposed/manager/ui/widget/IntegerListPreference.java index 2e859f42..0911a0e0 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/widget/IntegerListPreference.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/widget/IntegerListPreference.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.widget; +package io.github.lsposed.manager.ui.widget; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/widget/MasterSwitch.java b/app/src/main/java/io/github/lsposed/manager/ui/widget/MasterSwitch.java similarity index 97% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/widget/MasterSwitch.java rename to app/src/main/java/io/github/lsposed/manager/ui/widget/MasterSwitch.java index d5aff434..b1bad361 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/widget/MasterSwitch.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/widget/MasterSwitch.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.widget; +package io.github.lsposed.manager.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -15,7 +15,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.SwitchCompat; -import org.meowcat.edxposed.manager.R; +import io.github.lsposed.manager.R; public class MasterSwitch extends FrameLayout implements View.OnClickListener, Checkable { diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/widget/RecyclerViewBugFixed.java b/app/src/main/java/io/github/lsposed/manager/ui/widget/RecyclerViewBugFixed.java similarity index 98% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/widget/RecyclerViewBugFixed.java rename to app/src/main/java/io/github/lsposed/manager/ui/widget/RecyclerViewBugFixed.java index 0e9a0b3e..39561e5c 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/widget/RecyclerViewBugFixed.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/widget/RecyclerViewBugFixed.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.widget; +package io.github.lsposed.manager.ui.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/widget/ThemeColorPreference.java b/app/src/main/java/io/github/lsposed/manager/ui/widget/ThemeColorPreference.java similarity index 91% rename from app/src/main/java/org/meowcat/edxposed/manager/ui/widget/ThemeColorPreference.java rename to app/src/main/java/io/github/lsposed/manager/ui/widget/ThemeColorPreference.java index 3bd5e2cf..432e58aa 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/widget/ThemeColorPreference.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/widget/ThemeColorPreference.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.ui.widget; +package io.github.lsposed.manager.ui.widget; import android.content.Context; import android.util.AttributeSet; @@ -9,8 +9,8 @@ import com.takisoft.preferencex.ColorPickerPreference; import com.takisoft.preferencex.ColorPickerPreferenceDialogFragmentCompat; import com.takisoft.preferencex.PreferenceFragmentCompat; -import org.meowcat.edxposed.manager.util.CustomThemeColor; -import org.meowcat.edxposed.manager.util.CustomThemeColors; +import io.github.lsposed.manager.util.CustomThemeColor; +import io.github.lsposed.manager.util.CustomThemeColors; import java.util.Objects; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/CompileUtil.java b/app/src/main/java/io/github/lsposed/manager/util/CompileUtil.java similarity index 96% rename from app/src/main/java/org/meowcat/edxposed/manager/util/CompileUtil.java rename to app/src/main/java/io/github/lsposed/manager/util/CompileUtil.java index 86443a0d..9eca9054 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/CompileUtil.java +++ b/app/src/main/java/io/github/lsposed/manager/util/CompileUtil.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import android.annotation.SuppressLint; import android.app.Activity; @@ -14,9 +14,9 @@ import androidx.fragment.app.FragmentManager; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.topjohnwu.superuser.Shell; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.ui.fragment.CompileDialogFragment; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.ui.fragment.CompileDialogFragment; import java.util.List; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/CustomThemeColor.java b/app/src/main/java/io/github/lsposed/manager/util/CustomThemeColor.java similarity index 87% rename from app/src/main/java/org/meowcat/edxposed/manager/util/CustomThemeColor.java rename to app/src/main/java/io/github/lsposed/manager/util/CustomThemeColor.java index 88f59fb0..cdfd656c 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/CustomThemeColor.java +++ b/app/src/main/java/io/github/lsposed/manager/util/CustomThemeColor.java @@ -3,7 +3,7 @@ * All Rights Reserved. */ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import androidx.annotation.ColorRes; import androidx.annotation.NonNull; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/CustomThemeColors.java b/app/src/main/java/io/github/lsposed/manager/util/CustomThemeColors.java similarity index 98% rename from app/src/main/java/org/meowcat/edxposed/manager/util/CustomThemeColors.java rename to app/src/main/java/io/github/lsposed/manager/util/CustomThemeColors.java index ed2f2090..b909adb4 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/CustomThemeColors.java +++ b/app/src/main/java/io/github/lsposed/manager/util/CustomThemeColors.java @@ -1,9 +1,9 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import androidx.annotation.ColorRes; import androidx.annotation.NonNull; -import org.meowcat.edxposed.manager.R; +import io.github.lsposed.manager.R; public class CustomThemeColors { diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/GlideHelper.java b/app/src/main/java/io/github/lsposed/manager/util/GlideHelper.java similarity index 89% rename from app/src/main/java/org/meowcat/edxposed/manager/util/GlideHelper.java rename to app/src/main/java/io/github/lsposed/manager/util/GlideHelper.java index caf73c54..e24e7b14 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/GlideHelper.java +++ b/app/src/main/java/io/github/lsposed/manager/util/GlideHelper.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/IconLoader.java b/app/src/main/java/io/github/lsposed/manager/util/IconLoader.java similarity index 90% rename from app/src/main/java/org/meowcat/edxposed/manager/util/IconLoader.java rename to app/src/main/java/io/github/lsposed/manager/util/IconLoader.java index 878b4af1..944454ea 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/IconLoader.java +++ b/app/src/main/java/io/github/lsposed/manager/util/IconLoader.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import android.content.Context; import android.content.pm.PackageInfo; @@ -11,7 +11,7 @@ import com.bumptech.glide.Registry; import com.bumptech.glide.annotation.GlideModule; import com.bumptech.glide.module.AppGlideModule; -import org.meowcat.edxposed.manager.R; +import io.github.lsposed.manager.R; import me.zhanghai.android.appiconloader.glide.AppIconModelLoader; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/LinearLayoutManagerFix.java b/app/src/main/java/io/github/lsposed/manager/util/LinearLayoutManagerFix.java similarity index 95% rename from app/src/main/java/org/meowcat/edxposed/manager/util/LinearLayoutManagerFix.java rename to app/src/main/java/io/github/lsposed/manager/util/LinearLayoutManagerFix.java index 23d78865..3ac76292 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/LinearLayoutManagerFix.java +++ b/app/src/main/java/io/github/lsposed/manager/util/LinearLayoutManagerFix.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/ModuleUtil.java b/app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java similarity index 98% rename from app/src/main/java/org/meowcat/edxposed/manager/util/ModuleUtil.java rename to app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java index 7813b50c..ae34ec8a 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/ModuleUtil.java +++ b/app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; @@ -14,10 +14,10 @@ import androidx.annotation.NonNull; import com.google.android.material.snackbar.Snackbar; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.Constants; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.adapters.AppHelper; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.Constants; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.adapters.AppHelper; import java.io.IOException; import java.io.PrintWriter; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/NavUtil.java b/app/src/main/java/io/github/lsposed/manager/util/NavUtil.java similarity index 89% rename from app/src/main/java/org/meowcat/edxposed/manager/util/NavUtil.java rename to app/src/main/java/io/github/lsposed/manager/util/NavUtil.java index d3e64b4a..4085b967 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/NavUtil.java +++ b/app/src/main/java/io/github/lsposed/manager/util/NavUtil.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import android.content.Context; import android.net.Uri; @@ -13,9 +13,9 @@ import androidx.browser.customtabs.CustomTabsIntent; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.ui.activity.BaseActivity; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.ui.activity.BaseActivity; public final class NavUtil { diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/NotificationUtil.java b/app/src/main/java/io/github/lsposed/manager/util/NotificationUtil.java similarity index 97% rename from app/src/main/java/org/meowcat/edxposed/manager/util/NotificationUtil.java rename to app/src/main/java/io/github/lsposed/manager/util/NotificationUtil.java index 0f3ccee4..b1910818 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/NotificationUtil.java +++ b/app/src/main/java/io/github/lsposed/manager/util/NotificationUtil.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import android.annotation.SuppressLint; import android.app.NotificationManager; @@ -16,10 +16,10 @@ import androidx.core.content.ContextCompat; import com.topjohnwu.superuser.Shell; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.R; -import org.meowcat.edxposed.manager.ui.activity.MainActivity; -import org.meowcat.edxposed.manager.ui.activity.ModulesActivity; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.ui.activity.MainActivity; +import io.github.lsposed.manager.ui.activity.ModulesActivity; @SuppressLint("UnspecifiedImmutableFlag") public final class NotificationUtil { diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/RebootUtil.java b/app/src/main/java/io/github/lsposed/manager/util/RebootUtil.java similarity index 96% rename from app/src/main/java/org/meowcat/edxposed/manager/util/RebootUtil.java rename to app/src/main/java/io/github/lsposed/manager/util/RebootUtil.java index 5e42e248..1b3429ea 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/RebootUtil.java +++ b/app/src/main/java/io/github/lsposed/manager/util/RebootUtil.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import android.content.Context; import android.os.Build; @@ -8,8 +8,8 @@ import android.os.RemoteException; import com.topjohnwu.superuser.Shell; -import org.meowcat.edxposed.manager.App; -import org.meowcat.edxposed.manager.BuildConfig; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.BuildConfig; import rikka.shizuku.ShizukuBinderWrapper; import rikka.shizuku.ShizukuSystemProperties; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/Singleton.java b/app/src/main/java/io/github/lsposed/manager/util/Singleton.java similarity index 86% rename from app/src/main/java/org/meowcat/edxposed/manager/util/Singleton.java rename to app/src/main/java/io/github/lsposed/manager/util/Singleton.java index 1dd14bc0..530ac6cd 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/Singleton.java +++ b/app/src/main/java/io/github/lsposed/manager/util/Singleton.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; public abstract class Singleton { diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/ToastUtil.java b/app/src/main/java/io/github/lsposed/manager/util/ToastUtil.java similarity index 93% rename from app/src/main/java/org/meowcat/edxposed/manager/util/ToastUtil.java rename to app/src/main/java/io/github/lsposed/manager/util/ToastUtil.java index 1060356f..1e27b691 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/ToastUtil.java +++ b/app/src/main/java/io/github/lsposed/manager/util/ToastUtil.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util; +package io.github.lsposed.manager.util; import android.content.Context; import android.widget.Toast; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/light/Hack.java b/app/src/main/java/io/github/lsposed/manager/util/light/Hack.java similarity index 99% rename from app/src/main/java/org/meowcat/edxposed/manager/util/light/Hack.java rename to app/src/main/java/io/github/lsposed/manager/util/light/Hack.java index 69198517..71eda722 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/light/Hack.java +++ b/app/src/main/java/io/github/lsposed/manager/util/light/Hack.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util.light; +package io.github.lsposed.manager.util.light; import android.util.Log; diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/light/Light.java b/app/src/main/java/io/github/lsposed/manager/util/light/Light.java similarity index 97% rename from app/src/main/java/org/meowcat/edxposed/manager/util/light/Light.java rename to app/src/main/java/io/github/lsposed/manager/util/light/Light.java index 40bb0f88..c7343a88 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/util/light/Light.java +++ b/app/src/main/java/io/github/lsposed/manager/util/light/Light.java @@ -1,4 +1,4 @@ -package org.meowcat.edxposed.manager.util.light; +package io.github.lsposed.manager.util.light; import android.annotation.SuppressLint; import android.graphics.HardwareRenderer; diff --git a/app/src/main/res/layout/activity_logs.xml b/app/src/main/res/layout/activity_logs.xml index a8e8af89..31d13812 100644 --- a/app/src/main/res/layout/activity_logs.xml +++ b/app/src/main/res/layout/activity_logs.xml @@ -44,7 +44,7 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - diff --git a/app/src/main/res/layout/activity_scope_list.xml b/app/src/main/res/layout/activity_scope_list.xml index 2ed6034d..36502065 100644 --- a/app/src/main/res/layout/activity_scope_list.xml +++ b/app/src/main/res/layout/activity_scope_list.xml @@ -26,7 +26,7 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" android:orientation="vertical"> - - 关闭针对模块的\“LSPosed 安装状态\”检查 此处仅显示 LSPosed 及模块相关日志信息\n如果您想抓取系统日志, 可以尝试我们的 Log Catcher Magisk 模块 - + 白名单模式 白名单 黑名单 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 2126cb94..f87dbb06 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -103,7 +103,7 @@ 關閉針對模塊的\"LSPosed 安裝狀態\"檢查 此處僅顯示 LSPosed 及模塊相關日誌信息\n如果您想抓取系統日誌, 可以嘗試我們的 Log Catcher Magisk 模塊 - + 白名單模式 白名單 黑名單 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b6f78e04..4dd03f04 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -103,7 +103,7 @@ 關閉針對模組的\"LSPosed 安裝狀態\"檢查 此處僅顯示 LSPosed 及模組相關日誌資訊\n如果您想抓取系統日誌, 可以嘗試我們的 Log Catcher Magisk 模組 - + 允許單模式 允許名單 封鎖名單 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 45a39244..3a49a2db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -118,7 +118,7 @@ Could not detect Verified Boot state Verified Boot is active - + White List mode White List Black List diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index 0e414a04..54eb00d6 100644 --- a/app/src/main/res/xml/prefs.xml +++ b/app/src/main/res/xml/prefs.xml @@ -22,19 +22,19 @@ - - - + android:targetClass="io.github.lsposed.manager.ui.activity.ModulesActivity" + android:targetPackage="io.github.lsposed.manager" /> + android:targetClass="io.github.lsposed.manager.ui.activity.DownloadActivity" + android:targetPackage="io.github.lsposed.manager" /> \ No newline at end of file diff --git a/build.gradle b/build.gradle index d5e1d424..0eb4466c 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ allprojects { ext { versionCode = buildVersionCode versionName = buildVersionName - templateRootPath = project(":edxp-core").projectDir.path + "/template_override/" + templateRootPath = project(":core").projectDir.path + "/template_override/" templateSystemPath = templateRootPath + "/system/" templateSystemx86Path = templateRootPath + "/system_x86/" templateFrameworkPath = templateRootPath + "/system/framework/" @@ -39,7 +39,7 @@ allprojects { templateLib64Path = templateRootPath + "/system/lib64/" templateEtcPath = templateRootPath + "/system/etc/" hiddenApiStubJarFilePath = project(":hiddenapi-stubs").buildDir.absolutePath + "/libs/framework-stub.jar" - zipPathMagiskReleasePath = project(":edxp-core").projectDir.path + "/build/tmp/release/magisk/" + zipPathMagiskReleasePath = project(":core").projectDir.path + "/build/tmp/release/magisk/" } repositories { google() diff --git a/edxp-core/.gitignore b/core/.gitignore similarity index 100% rename from edxp-core/.gitignore rename to core/.gitignore diff --git a/edxp-core/build.gradle b/core/build.gradle similarity index 96% rename from edxp-core/build.gradle rename to core/build.gradle index 653fa9c7..bc595df4 100644 --- a/edxp-core/build.gradle +++ b/core/build.gradle @@ -45,7 +45,7 @@ dependencies { android { compileSdkVersion androidCompileSdkVersion.toInteger() defaultConfig { - applicationId "com.elderdrivers.riru.edxp" + applicationId "io.github.lsposed.lspd" minSdkVersion androidMinSdkVersion.toInteger() targetSdkVersion androidTargetSdkVersion.toInteger() multiDexEnabled false @@ -142,7 +142,7 @@ afterEvaluate { "${buildDir}/intermediates/dex/${variantLowered}/minify${variantCapped}WithR8" : "${buildDir}/intermediates/dex/${variantLowered}/mergeDex${variantCapped}" from (dexOutPath){ - rename("classes.dex", "edxp.dex") + rename("classes.dex", "lspd.dex") } destinationDir file(zipPathMagiskReleasePath + "system/framework/") outputs.upToDateWhen { false } @@ -174,7 +174,7 @@ afterEvaluate { "${buildDir}/intermediates/dex/${variantLowered}/mergeDex${variantCapped}" copy { from (dexOutPath){ - rename("classes.dex", "edxp.dex") + rename("classes.dex", "lspd.dex") } into file(zipPathMagiskReleasePath + "system/framework/") } @@ -196,22 +196,22 @@ afterEvaluate { eol: FixCrLfFilter.CrLf.newInstance("lf")) } copy { - include "libriru_edxp.so" + include "libriru_lspd.so" from "$libPathRelease/armeabi-v7a" into "$zipPathMagiskReleasePath/system/lib" } copy { - include "libriru_edxp.so" + include "libriru_lspd.so" from "$libPathRelease/arm64-v8a" into "$zipPathMagiskReleasePath/system/lib64" } copy { - include "libriru_edxp.so" + include "libriru_lspd.so" from "$libPathRelease/x86" into "$zipPathMagiskReleasePath/system_x86/lib" } copy { - include "libriru_edxp.so" + include "libriru_lspd.so" from "$libPathRelease/x86_64" into "$zipPathMagiskReleasePath/system_x86/lib64" } diff --git a/edxp-core/proguard-rules.pro b/core/proguard-rules.pro similarity index 76% rename from edxp-core/proguard-rules.pro rename to core/proguard-rules.pro index 427bf7d0..e836635a 100644 --- a/edxp-core/proguard-rules.pro +++ b/core/proguard-rules.pro @@ -25,8 +25,8 @@ -keep class de.robv.android.xposed.** {*;} -keep class android.** { *; } --keep interface com.elderdrivers.riru.common.KeepAll --keep interface com.elderdrivers.riru.common.KeepMembers +-keep interface io.github.lsposed.common.KeepAll +-keep interface io.github.lsposed.common.KeepMembers --keep class * implements com.elderdrivers.riru.common.KeepAll { *; } --keepclassmembers class * implements com.elderdrivers.riru.common.KeepMembers { *; } \ No newline at end of file +-keep class * implements io.github.lsposed.common.KeepAll { *; } +-keepclassmembers class * implements io.github.lsposed.common.KeepMembers { *; } \ No newline at end of file diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml new file mode 100644 index 00000000..4a13d03c --- /dev/null +++ b/core/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/edxp-core/src/main/cpp/CMakeLists.txt b/core/src/main/cpp/CMakeLists.txt similarity index 100% rename from edxp-core/src/main/cpp/CMakeLists.txt rename to core/src/main/cpp/CMakeLists.txt diff --git a/edxp-core/src/main/cpp/external/CMakeLists.txt b/core/src/main/cpp/external/CMakeLists.txt similarity index 100% rename from edxp-core/src/main/cpp/external/CMakeLists.txt rename to core/src/main/cpp/external/CMakeLists.txt diff --git a/edxp-core/src/main/cpp/external/android/CMakeLists.txt b/core/src/main/cpp/external/android/CMakeLists.txt similarity index 100% rename from edxp-core/src/main/cpp/external/android/CMakeLists.txt rename to core/src/main/cpp/external/android/CMakeLists.txt diff --git a/edxp-core/src/main/cpp/external/android/android-base/file.cpp b/core/src/main/cpp/external/android/android-base/file.cpp similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/file.cpp rename to core/src/main/cpp/external/android/android-base/file.cpp diff --git a/edxp-core/src/main/cpp/external/android/android-base/file.h b/core/src/main/cpp/external/android/android-base/file.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/file.h rename to core/src/main/cpp/external/android/android-base/file.h diff --git a/edxp-core/src/main/cpp/external/android/android-base/logging.cpp b/core/src/main/cpp/external/android/android-base/logging.cpp similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/logging.cpp rename to core/src/main/cpp/external/android/android-base/logging.cpp diff --git a/edxp-core/src/main/cpp/external/android/android-base/logging.h b/core/src/main/cpp/external/android/android-base/logging.h similarity index 99% rename from edxp-core/src/main/cpp/external/android/android-base/logging.h rename to core/src/main/cpp/external/android/android-base/logging.h index f6a56f3b..cf67434c 100644 --- a/edxp-core/src/main/cpp/external/android/android-base/logging.h +++ b/core/src/main/cpp/external/android/android-base/logging.h @@ -65,7 +65,7 @@ #ifdef LOG_TAG #define _LOG_TAG_INTERNAL LOG_TAG #else -#define _LOG_TAG_INTERNAL "EdXposed" +#define _LOG_TAG_INTERNAL "LSPosed" #endif namespace android { namespace base { diff --git a/edxp-core/src/main/cpp/external/android/android-base/macros.h b/core/src/main/cpp/external/android/android-base/macros.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/macros.h rename to core/src/main/cpp/external/android/android-base/macros.h diff --git a/edxp-core/src/main/cpp/external/android/android-base/off64_t.h b/core/src/main/cpp/external/android/android-base/off64_t.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/off64_t.h rename to core/src/main/cpp/external/android/android-base/off64_t.h diff --git a/edxp-core/src/main/cpp/external/android/android-base/parseint.h b/core/src/main/cpp/external/android/android-base/parseint.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/parseint.h rename to core/src/main/cpp/external/android/android-base/parseint.h diff --git a/edxp-core/src/main/cpp/external/android/android-base/strings.cpp b/core/src/main/cpp/external/android/android-base/strings.cpp similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/strings.cpp rename to core/src/main/cpp/external/android/android-base/strings.cpp diff --git a/edxp-core/src/main/cpp/external/android/android-base/strings.h b/core/src/main/cpp/external/android/android-base/strings.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/strings.h rename to core/src/main/cpp/external/android/android-base/strings.h diff --git a/edxp-core/src/main/cpp/external/android/android-base/thread_annotations.h b/core/src/main/cpp/external/android/android-base/thread_annotations.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/thread_annotations.h rename to core/src/main/cpp/external/android/android-base/thread_annotations.h diff --git a/edxp-core/src/main/cpp/external/android/android-base/threads.cpp b/core/src/main/cpp/external/android/android-base/threads.cpp similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/threads.cpp rename to core/src/main/cpp/external/android/android-base/threads.cpp diff --git a/edxp-core/src/main/cpp/external/android/android-base/threads.h b/core/src/main/cpp/external/android/android-base/threads.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/threads.h rename to core/src/main/cpp/external/android/android-base/threads.h diff --git a/edxp-core/src/main/cpp/external/android/android-base/unique_fd.h b/core/src/main/cpp/external/android/android-base/unique_fd.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/unique_fd.h rename to core/src/main/cpp/external/android/android-base/unique_fd.h diff --git a/edxp-core/src/main/cpp/external/android/android-base/utf8.h b/core/src/main/cpp/external/android/android-base/utf8.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android-base/utf8.h rename to core/src/main/cpp/external/android/android-base/utf8.h diff --git a/edxp-core/src/main/cpp/external/android/android/fdsan.h b/core/src/main/cpp/external/android/android/fdsan.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/android/fdsan.h rename to core/src/main/cpp/external/android/android/fdsan.h diff --git a/edxp-core/src/main/cpp/external/android/art/base/macros.h b/core/src/main/cpp/external/android/art/base/macros.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/art/base/macros.h rename to core/src/main/cpp/external/android/art/base/macros.h diff --git a/edxp-core/src/main/cpp/external/android/art/runtime/native/native_util.h b/core/src/main/cpp/external/android/art/runtime/native/native_util.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/art/runtime/native/native_util.h rename to core/src/main/cpp/external/android/art/runtime/native/native_util.h diff --git a/edxp-core/src/main/cpp/external/android/nativehelper/jni_macros.h b/core/src/main/cpp/external/android/nativehelper/jni_macros.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/nativehelper/jni_macros.h rename to core/src/main/cpp/external/android/nativehelper/jni_macros.h diff --git a/edxp-core/src/main/cpp/external/android/nativehelper/module_api.h b/core/src/main/cpp/external/android/nativehelper/module_api.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/nativehelper/module_api.h rename to core/src/main/cpp/external/android/nativehelper/module_api.h diff --git a/edxp-core/src/main/cpp/external/android/nativehelper/nativehelper_utils.h b/core/src/main/cpp/external/android/nativehelper/nativehelper_utils.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/nativehelper/nativehelper_utils.h rename to core/src/main/cpp/external/android/nativehelper/nativehelper_utils.h diff --git a/edxp-core/src/main/cpp/external/android/nativehelper/scoped_local_ref.h b/core/src/main/cpp/external/android/nativehelper/scoped_local_ref.h similarity index 100% rename from edxp-core/src/main/cpp/external/android/nativehelper/scoped_local_ref.h rename to core/src/main/cpp/external/android/nativehelper/scoped_local_ref.h diff --git a/edxp-core/src/main/cpp/external/xhook/CMakeLists.txt b/core/src/main/cpp/external/xhook/CMakeLists.txt similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/CMakeLists.txt rename to core/src/main/cpp/external/xhook/CMakeLists.txt diff --git a/edxp-core/src/main/cpp/external/xhook/include/xhook.h b/core/src/main/cpp/external/xhook/include/xhook.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/include/xhook.h rename to core/src/main/cpp/external/xhook/include/xhook.h diff --git a/edxp-core/src/main/cpp/external/xhook/src/queue.h b/core/src/main/cpp/external/xhook/src/queue.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/queue.h rename to core/src/main/cpp/external/xhook/src/queue.h diff --git a/edxp-core/src/main/cpp/external/xhook/src/tree.h b/core/src/main/cpp/external/xhook/src/tree.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/tree.h rename to core/src/main/cpp/external/xhook/src/tree.h diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_core.c b/core/src/main/cpp/external/xhook/src/xh_core.c similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_core.c rename to core/src/main/cpp/external/xhook/src/xh_core.c diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_core.h b/core/src/main/cpp/external/xhook/src/xh_core.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_core.h rename to core/src/main/cpp/external/xhook/src/xh_core.h diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_elf.c b/core/src/main/cpp/external/xhook/src/xh_elf.c similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_elf.c rename to core/src/main/cpp/external/xhook/src/xh_elf.c diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_elf.h b/core/src/main/cpp/external/xhook/src/xh_elf.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_elf.h rename to core/src/main/cpp/external/xhook/src/xh_elf.h diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_errno.h b/core/src/main/cpp/external/xhook/src/xh_errno.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_errno.h rename to core/src/main/cpp/external/xhook/src/xh_errno.h diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_jni.c b/core/src/main/cpp/external/xhook/src/xh_jni.c similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_jni.c rename to core/src/main/cpp/external/xhook/src/xh_jni.c diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_log.c b/core/src/main/cpp/external/xhook/src/xh_log.c similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_log.c rename to core/src/main/cpp/external/xhook/src/xh_log.c diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_log.h b/core/src/main/cpp/external/xhook/src/xh_log.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_log.h rename to core/src/main/cpp/external/xhook/src/xh_log.h diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_util.c b/core/src/main/cpp/external/xhook/src/xh_util.c similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_util.c rename to core/src/main/cpp/external/xhook/src/xh_util.c diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_util.h b/core/src/main/cpp/external/xhook/src/xh_util.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_util.h rename to core/src/main/cpp/external/xhook/src/xh_util.h diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_version.c b/core/src/main/cpp/external/xhook/src/xh_version.c similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_version.c rename to core/src/main/cpp/external/xhook/src/xh_version.c diff --git a/edxp-core/src/main/cpp/external/xhook/src/xh_version.h b/core/src/main/cpp/external/xhook/src/xh_version.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xh_version.h rename to core/src/main/cpp/external/xhook/src/xh_version.h diff --git a/edxp-core/src/main/cpp/external/xhook/src/xhook.c b/core/src/main/cpp/external/xhook/src/xhook.c similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xhook.c rename to core/src/main/cpp/external/xhook/src/xhook.c diff --git a/edxp-core/src/main/cpp/external/xhook/src/xhook.h b/core/src/main/cpp/external/xhook/src/xhook.h similarity index 100% rename from edxp-core/src/main/cpp/external/xhook/src/xhook.h rename to core/src/main/cpp/external/xhook/src/xhook.h diff --git a/edxp-core/src/main/cpp/external/yahfa/CMakeLists.txt b/core/src/main/cpp/external/yahfa/CMakeLists.txt similarity index 100% rename from edxp-core/src/main/cpp/external/yahfa/CMakeLists.txt rename to core/src/main/cpp/external/yahfa/CMakeLists.txt diff --git a/edxp-core/src/main/cpp/external/yahfa/include/HookMain.h b/core/src/main/cpp/external/yahfa/include/HookMain.h similarity index 100% rename from edxp-core/src/main/cpp/external/yahfa/include/HookMain.h rename to core/src/main/cpp/external/yahfa/include/HookMain.h diff --git a/edxp-core/src/main/cpp/external/yahfa/include/trampoline.h b/core/src/main/cpp/external/yahfa/include/trampoline.h similarity index 100% rename from edxp-core/src/main/cpp/external/yahfa/include/trampoline.h rename to core/src/main/cpp/external/yahfa/include/trampoline.h diff --git a/edxp-core/src/main/cpp/external/yahfa/src/HookMain.c b/core/src/main/cpp/external/yahfa/src/HookMain.c similarity index 100% rename from edxp-core/src/main/cpp/external/yahfa/src/HookMain.c rename to core/src/main/cpp/external/yahfa/src/HookMain.c diff --git a/edxp-core/src/main/cpp/external/yahfa/src/common.h b/core/src/main/cpp/external/yahfa/src/common.h similarity index 96% rename from edxp-core/src/main/cpp/external/yahfa/src/common.h rename to core/src/main/cpp/external/yahfa/src/common.h index fcf840d2..1ada70c8 100644 --- a/edxp-core/src/main/cpp/external/yahfa/src/common.h +++ b/core/src/main/cpp/external/yahfa/src/common.h @@ -14,7 +14,7 @@ #define LOGW(...) #define LOGE(...) #else -#define LOG_TAG "EdXposed" +#define LOG_TAG "LSPosed" #ifndef NDEBUG #define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__) #define LOGW(...) __android_log_print(ANDROID_LOG_WARN,LOG_TAG,__VA_ARGS__) diff --git a/edxp-core/src/main/cpp/external/yahfa/src/trampoline.c b/core/src/main/cpp/external/yahfa/src/trampoline.c similarity index 100% rename from edxp-core/src/main/cpp/external/yahfa/src/trampoline.c rename to core/src/main/cpp/external/yahfa/src/trampoline.c diff --git a/edxp-core/src/main/cpp/main/CMakeLists.txt b/core/src/main/cpp/main/CMakeLists.txt similarity index 64% rename from edxp-core/src/main/cpp/main/CMakeLists.txt rename to core/src/main/cpp/main/CMakeLists.txt index 23c71d45..eab0db5b 100644 --- a/edxp-core/src/main/cpp/main/CMakeLists.txt +++ b/core/src/main/cpp/main/CMakeLists.txt @@ -5,8 +5,8 @@ set(CMAKE_ANDROID_STL_TYPE c++_static) aux_source_directory(src SRC_LIST) aux_source_directory(src/jni SRC_JNI_LIST) include_directories(include src) -add_library(riru_edxp SHARED ${SRC_LIST} ${SRC_JNI_LIST}) +add_library(riru_lspd SHARED ${SRC_LIST} ${SRC_JNI_LIST}) find_package(riru REQUIRED CONFIG) find_library(log-lib log) -target_link_libraries(riru_edxp yahfa riru::riru xhook android dobby ${log-lib}) \ No newline at end of file +target_link_libraries(riru_lspd yahfa riru::riru xhook android dobby ${log-lib}) \ No newline at end of file diff --git a/edxp-core/src/main/cpp/main/include/ByteOrder.h b/core/src/main/cpp/main/include/ByteOrder.h similarity index 89% rename from edxp-core/src/main/cpp/main/include/ByteOrder.h rename to core/src/main/cpp/main/include/ByteOrder.h index d44ef43e..a44bf199 100644 --- a/edxp-core/src/main/cpp/main/include/ByteOrder.h +++ b/core/src/main/cpp/main/include/ByteOrder.h @@ -2,8 +2,8 @@ // Created by solo on 2019/3/24. // -#ifndef EDXPOSED_TEMP_BYTEORDER_H -#define EDXPOSED_TEMP_BYTEORDER_H +#ifndef LSPOSED_TEMP_BYTEORDER_H +#define LSPOSED_TEMP_BYTEORDER_H #include @@ -40,4 +40,4 @@ static inline uint16_t android_swap_short(uint16_t v) #define toles(x) (android_swap_short(x)) #endif -#endif //EDXPOSED_TEMP_BYTEORDER_H +#endif //LSPOSED_TEMP_BYTEORDER_H diff --git a/edxp-core/src/main/cpp/main/include/JNIHelper.h b/core/src/main/cpp/main/include/JNIHelper.h similarity index 100% rename from edxp-core/src/main/cpp/main/include/JNIHelper.h rename to core/src/main/cpp/main/include/JNIHelper.h diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/art_method.h b/core/src/main/cpp/main/include/art/runtime/art_method.h similarity index 86% rename from edxp-core/src/main/cpp/main/include/art/runtime/art_method.h rename to core/src/main/cpp/main/include/art/runtime/art_method.h index 57d0342a..00f8b19d 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/art_method.h +++ b/core/src/main/cpp/main/include/art/runtime/art_method.h @@ -2,10 +2,10 @@ // Created by 双草酸酯 on 12/19/20. // -#ifndef EDXPOSED_ART_METHOD_H -#define EDXPOSED_ART_METHOD_H +#ifndef LSPOSED_ART_METHOD_H +#define LSPOSED_ART_METHOD_H -#include "jni/edxp_pending_hooks.h" +#include "jni/pending_hooks.h" #include namespace art { @@ -29,4 +29,4 @@ namespace art { } } -#endif //EDXPOSED_ART_METHOD_H +#endif //LSPOSED_ART_METHOD_H diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/class_linker.h b/core/src/main/cpp/main/include/art/runtime/class_linker.h similarity index 89% rename from edxp-core/src/main/cpp/main/include/art/runtime/class_linker.h rename to core/src/main/cpp/main/include/art/runtime/class_linker.h index 102f2d36..46bc1cbd 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/class_linker.h +++ b/core/src/main/cpp/main/include/art/runtime/class_linker.h @@ -8,14 +8,14 @@ #include "runtime.h" #include "config.h" #include "jni_env_ext.h" -#include "edxp_context.h" -#include "jni/edxp_pending_hooks.h" +#include "context.h" +#include "jni/pending_hooks.h" #include "utils.h" #include "HookMain.h" namespace art { - class ClassLinker : public edxp::HookedObject { + class ClassLinker : public lspd::HookedObject { private: inline static ClassLinker *instance_; @@ -29,11 +29,11 @@ namespace art { ALWAYS_INLINE static void MaybeDelayHook(void *clazz_ptr) { art::mirror::Class mirror_class(clazz_ptr); auto class_def = mirror_class.GetClassDef(); - bool should_intercept = class_def && edxp::IsClassPending(class_def); + bool should_intercept = class_def && lspd::IsClassPending(class_def); if (UNLIKELY(should_intercept)) { LOGD("Pending hook for %p (%s)", clazz_ptr, art::mirror::Class(clazz_ptr).GetDescriptor().c_str()); - edxp::Context::GetInstance()->CallOnPostFixupStaticTrampolines(clazz_ptr); + lspd::Context::GetInstance()->CallOnPostFixupStaticTrampolines(clazz_ptr); } } @@ -63,7 +63,7 @@ namespace art { "_ZN3art11ClassLinker30ShouldUseInterpreterEntrypointEPNS_9ArtMethodEPKv", bool, ShouldUseInterpreterEntrypoint, (void * art_method, const void *quick_code), { - if (quick_code != nullptr && UNLIKELY(edxp::isHooked(art_method))) { + if (quick_code != nullptr && UNLIKELY(lspd::isHooked(art_method))) { return false; } return backup(art_method, quick_code); @@ -79,27 +79,27 @@ namespace art { // @ApiSensitive(Level.MIDDLE) static void Setup(void *handle, HookFunType hook_func) { LOGD("Classlinker hook setup, handle=%p", handle); - int api_level = edxp::GetAndroidApiLevel(); + int api_level = lspd::GetAndroidApiLevel(); size_t OFFSET_classlinker; // Get offset from art::Runtime::RunRootClinits() call in IDA switch (api_level) { case __ANDROID_API_O__: [[fallthrough]]; case __ANDROID_API_O_MR1__: - if constexpr(edxp::is64) { + if constexpr(lspd::is64) { OFFSET_classlinker = 464; } else { OFFSET_classlinker = 284; } break; case __ANDROID_API_P__: - if constexpr(edxp::is64) { + if constexpr(lspd::is64) { OFFSET_classlinker = 528; } else { OFFSET_classlinker = 336; } break; case __ANDROID_API_Q__: - if constexpr(edxp::is64) { + if constexpr(lspd::is64) { OFFSET_classlinker = 480; } else { OFFSET_classlinker = 280; @@ -109,7 +109,7 @@ namespace art { LOGE("No valid offset for art::Runtime::class_linker_ found. Using Android R."); [[fallthrough]]; case __ANDROID_API_R__: - if constexpr(edxp::is64) { + if constexpr(lspd::is64) { OFFSET_classlinker = 472; } else { OFFSET_classlinker = 276; @@ -126,9 +126,9 @@ namespace art { RETRIEVE_MEM_FUNC_SYMBOL(SetEntryPointsToInterpreter, "_ZNK3art11ClassLinker27SetEntryPointsToInterpreterEPNS_9ArtMethodE"); - edxp::HookSyms(handle, hook_func, FixupStaticTrampolines, + lspd::HookSyms(handle, hook_func, FixupStaticTrampolines, FixupStaticTrampolinesWithThread); - edxp::HookSyms(handle, hook_func, ShouldUseInterpreterEntrypoint); + lspd::HookSyms(handle, hook_func, ShouldUseInterpreterEntrypoint); // MakeInitializedClassesVisiblyInitialized will cause deadlock // IsQuickToInterpreterBridge is inlined diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/gc/collector/gc_type.h b/core/src/main/cpp/main/include/art/runtime/gc/collector/gc_type.h similarity index 100% rename from edxp-core/src/main/cpp/main/include/art/runtime/gc/collector/gc_type.h rename to core/src/main/cpp/main/include/art/runtime/gc/collector/gc_type.h diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/gc/gc_cause.h b/core/src/main/cpp/main/include/art/runtime/gc/gc_cause.h similarity index 100% rename from edxp-core/src/main/cpp/main/include/art/runtime/gc/gc_cause.h rename to core/src/main/cpp/main/include/art/runtime/gc/gc_cause.h diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/gc/heap.h b/core/src/main/cpp/main/include/art/runtime/gc/heap.h similarity index 88% rename from edxp-core/src/main/cpp/main/include/art/runtime/gc/heap.h rename to core/src/main/cpp/main/include/art/runtime/gc/heap.h index e6c8f597..0d6ff447 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/gc/heap.h +++ b/core/src/main/cpp/main/include/art/runtime/gc/heap.h @@ -11,7 +11,7 @@ namespace art { namespace gc { - class Heap : public edxp::HookedObject { + class Heap : public lspd::HookedObject { private: inline static Heap *instance_; @@ -32,27 +32,27 @@ namespace art { // @ApiSensitive(Level.MIDDLE) static void Setup(void *handle, HookFunType hook_func) { - int api_level = edxp::GetAndroidApiLevel(); + int api_level = lspd::GetAndroidApiLevel(); size_t OFFSET_heap; // Get offset from art::Runtime::RunRootClinits() call in IDA switch (api_level) { case __ANDROID_API_O__: [[fallthrough]]; case __ANDROID_API_O_MR1__: - if constexpr(edxp::is64) { + if constexpr(lspd::is64) { OFFSET_heap = 0x180; } else { OFFSET_heap = 0xF4; } break; case __ANDROID_API_P__: - if constexpr(edxp::is64) { + if constexpr(lspd::is64) { OFFSET_heap = 0x1C0; } else { OFFSET_heap = 0x128; } break; case __ANDROID_API_Q__: - if constexpr(edxp::is64) { + if constexpr(lspd::is64) { OFFSET_heap = 0x190; } else { OFFSET_heap = 0xF0; @@ -62,16 +62,16 @@ namespace art { LOGE("No valid offset for art::Runtime::heap_ found. Using Android R."); [[fallthrough]]; case __ANDROID_API_R__: - if constexpr(edxp::is64) { + if constexpr(lspd::is64) { // TODO: preload band to a boolean or enum - if (edxp::GetAndroidBrand() == "meizu") { + if (lspd::GetAndroidBrand() == "meizu") { OFFSET_heap = 0x190; } else { OFFSET_heap = 392; } } else { // TODO: preload band to a boolean or enum - if (edxp::GetAndroidBrand() == "meizu") { + if (lspd::GetAndroidBrand() == "meizu") { OFFSET_heap = 0xF4; } else { OFFSET_heap = 236; diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/hidden_api.h b/core/src/main/cpp/main/include/art/runtime/hidden_api.h similarity index 84% rename from edxp-core/src/main/cpp/main/include/art/runtime/hidden_api.h rename to core/src/main/cpp/main/include/art/runtime/hidden_api.h index edbd3e4a..63fe7671 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/hidden_api.h +++ b/core/src/main/cpp/main/include/art/runtime/hidden_api.h @@ -40,16 +40,16 @@ namespace art { // @ApiSensitive(Level.HIGH) static void DisableHiddenApi(void *handle, HookFunType hook_func) { - const int api_level = edxp::GetAndroidApiLevel(); + const int api_level = lspd::GetAndroidApiLevel(); if (api_level < __ANDROID_API_P__) { return; } if (api_level == __ANDROID_API_P__) { - edxp::HookSyms(handle, hook_func, GetMethodActionImpl); - edxp::HookSyms(handle, hook_func, GetFieldActionImpl); + lspd::HookSyms(handle, hook_func, GetMethodActionImpl); + lspd::HookSyms(handle, hook_func, GetFieldActionImpl); } else { - edxp::HookSyms(handle, hook_func, ShouldDenyAccessToMethodImpl); - edxp::HookSyms(handle, hook_func, ShouldDenyAccessToFieldImpl); + lspd::HookSyms(handle, hook_func, ShouldDenyAccessToMethodImpl); + lspd::HookSyms(handle, hook_func, ShouldDenyAccessToFieldImpl); } }; diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/instrumentation.h b/core/src/main/cpp/main/include/art/runtime/instrumentation.h similarity index 77% rename from edxp-core/src/main/cpp/main/include/art/runtime/instrumentation.h rename to core/src/main/cpp/main/include/art/runtime/instrumentation.h index 4b7296de..4c180289 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/instrumentation.h +++ b/core/src/main/cpp/main/include/art/runtime/instrumentation.h @@ -2,8 +2,8 @@ // Created by loves on 1/27/2021. // -#ifndef EDXPOSED_INSTRUMENTATION_H -#define EDXPOSED_INSTRUMENTATION_H +#ifndef LSPOSED_INSTRUMENTATION_H +#define LSPOSED_INSTRUMENTATION_H #include "base/object.h" @@ -13,7 +13,7 @@ namespace art { CREATE_MEM_HOOK_STUB_ENTRIES( "_ZN3art15instrumentation15Instrumentation21UpdateMethodsCodeImplEPNS_9ArtMethodEPKv", void, UpdateMethodsCode, (void * thiz, void * art_method, const void *quick_code), { - if (UNLIKELY(edxp::isHooked(art_method))) { + if (UNLIKELY(lspd::isHooked(art_method))) { LOGD("Skip update method code for hooked method %s", art_method::PrettyMethod(art_method).c_str()); return; @@ -23,8 +23,8 @@ namespace art { }); static void DisableUpdateHookedMethodsCode(void *handle, HookFunType hook_func) { - edxp::HookSym(handle, hook_func, UpdateMethodsCode); + lspd::HookSym(handle, hook_func, UpdateMethodsCode); } } } -#endif //EDXPOSED_INSTRUMENTATION_H +#endif //LSPOSED_INSTRUMENTATION_H diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/jni_env_ext.h b/core/src/main/cpp/main/include/art/runtime/jni_env_ext.h similarity index 95% rename from edxp-core/src/main/cpp/main/include/art/runtime/jni_env_ext.h rename to core/src/main/cpp/main/include/art/runtime/jni_env_ext.h index f33035a3..b6bddf6f 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/jni_env_ext.h +++ b/core/src/main/cpp/main/include/art/runtime/jni_env_ext.h @@ -6,7 +6,7 @@ namespace art { - class JNIEnvExt : edxp::HookedObject { + class JNIEnvExt : lspd::HookedObject { private: CREATE_MEM_FUNC_SYMBOL_ENTRY(jobject, NewLocalRef, void *thiz, void *mirror_ptr) { diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/mirror/class.h b/core/src/main/cpp/main/include/art/runtime/mirror/class.h similarity index 96% rename from edxp-core/src/main/cpp/main/include/art/runtime/mirror/class.h rename to core/src/main/cpp/main/include/art/runtime/mirror/class.h index 8aee170b..8706ecab 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/mirror/class.h +++ b/core/src/main/cpp/main/include/art/runtime/mirror/class.h @@ -1,14 +1,14 @@ #pragma once -#include +#include #include "base/object.h" namespace art { namespace mirror { using namespace std; - using namespace edxp; + using namespace lspd; class Class : public HookedObject { @@ -61,7 +61,7 @@ namespace art { RETRIEVE_MEM_FUNC_SYMBOL(GetClassDef, "_ZN3art6mirror5Class11GetClassDefEv"); - edxp::HookSyms(handle, hook_func, IsInSamePackage); + lspd::HookSyms(handle, hook_func, IsInSamePackage); } const char *GetDescriptor(std::string *storage) { diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/reflection.h b/core/src/main/cpp/main/include/art/runtime/reflection.h similarity index 84% rename from edxp-core/src/main/cpp/main/include/art/runtime/reflection.h rename to core/src/main/cpp/main/include/art/runtime/reflection.h index 49dd2c1b..e63a7412 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/reflection.h +++ b/core/src/main/cpp/main/include/art/runtime/reflection.h @@ -2,8 +2,8 @@ // Created by loves on 1/28/2021. // -#ifndef EDXPOSED_REFLECTION_H -#define EDXPOSED_REFLECTION_H +#ifndef LSPOSED_REFLECTION_H +#define LSPOSED_REFLECTION_H #include "base/object.h" @@ -22,7 +22,7 @@ namespace art { }); static void PermissiveAccessByReflection(void *handle, HookFunType hook_func) { - edxp::HookSym(handle, hook_func, VerifyAccess); + lspd::HookSym(handle, hook_func, VerifyAccess); } } -#endif //EDXPOSED_REFLECTION_H +#endif //LSPOSED_REFLECTION_H diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/runtime.h b/core/src/main/cpp/main/include/art/runtime/runtime.h similarity index 95% rename from edxp-core/src/main/cpp/main/include/art/runtime/runtime.h rename to core/src/main/cpp/main/include/art/runtime/runtime.h index cd90956b..f59fb1f7 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/runtime.h +++ b/core/src/main/cpp/main/include/art/runtime/runtime.h @@ -6,7 +6,7 @@ namespace art { - class Runtime : public edxp::HookedObject { + class Runtime : public lspd::HookedObject { private: inline static Runtime *instance_; diff --git a/edxp-core/src/main/cpp/main/include/art/runtime/thread.h b/core/src/main/cpp/main/include/art/runtime/thread.h similarity index 91% rename from edxp-core/src/main/cpp/main/include/art/runtime/thread.h rename to core/src/main/cpp/main/include/art/runtime/thread.h index 9935f5a3..0573f4d3 100644 --- a/edxp-core/src/main/cpp/main/include/art/runtime/thread.h +++ b/core/src/main/cpp/main/include/art/runtime/thread.h @@ -5,9 +5,9 @@ namespace art { - class Thread : public edxp::HookedObject { + class Thread : public lspd::HookedObject { - CREATE_MEM_FUNC_SYMBOL_ENTRY(edxp::ObjPtr, DecodeJObject, void *thiz, jobject obj) { + CREATE_MEM_FUNC_SYMBOL_ENTRY(lspd::ObjPtr, DecodeJObject, void *thiz, jobject obj) { if (DecodeJObjectSym) return DecodeJObjectSym(thiz, obj); else diff --git a/edxp-core/src/main/cpp/main/include/base/object.h b/core/src/main/cpp/main/include/base/object.h similarity index 94% rename from edxp-core/src/main/cpp/main/include/base/object.h rename to core/src/main/cpp/main/include/base/object.h index 768cb87f..8c57112a 100644 --- a/edxp-core/src/main/cpp/main/include/base/object.h +++ b/core/src/main/cpp/main/include/base/object.h @@ -24,25 +24,25 @@ typedef void (*HookFunType)(void *, void *, void **); #define CONCATENATE(a, b) a##b #define CREATE_HOOK_STUB_ENTRIES(SYM, RET, FUNC, PARAMS, DEF) \ - inline static struct : public edxp::Hooker{ \ + inline static struct : public lspd::Hooker{ \ inline static RET replace PARAMS DEF \ } FUNC #define CREATE_MEM_HOOK_STUB_ENTRIES(SYM, RET, FUNC, PARAMS, DEF) \ - inline static struct : public edxp::MemHooker{ \ + inline static struct : public lspd::MemHooker{ \ inline static RET replace PARAMS DEF \ } FUNC #define RETRIEVE_FUNC_SYMBOL(name, ...) \ name##Sym = reinterpret_cast( \ - edxp::Dlsym(handle, __VA_ARGS__)) + lspd::Dlsym(handle, __VA_ARGS__)) #define RETRIEVE_MEM_FUNC_SYMBOL(name, ...) \ name##Sym = reinterpret_cast( \ - edxp::Dlsym(handle, __VA_ARGS__)) + lspd::Dlsym(handle, __VA_ARGS__)) #define RETRIEVE_FIELD_SYMBOL(name, ...) \ - void *name = edxp::Dlsym(handle, __VA_ARGS__) + void *name = lspd::Dlsym(handle, __VA_ARGS__) #define CREATE_FUNC_SYMBOL_ENTRY(ret, func, ...) \ typedef ret (*func##Type)(__VA_ARGS__); \ @@ -50,11 +50,11 @@ typedef void (*HookFunType)(void *, void *, void **); inline static ret func(__VA_ARGS__) #define CREATE_MEM_FUNC_SYMBOL_ENTRY(ret, func, thiz, ...) \ - using func##Type = edxp::MemberFunction; \ + using func##Type = lspd::MemberFunction; \ inline static func##Type func##Sym; \ inline static ret func(thiz, ## __VA_ARGS__) -namespace edxp { +namespace lspd { class ShadowObject { @@ -233,8 +233,8 @@ namespace edxp { return true; } -} // namespace edxp +} // namespace lspd -using edxp::operator ""_tstr; +using lspd::operator ""_tstr; #pragma clang diagnostic pop diff --git a/edxp-core/src/main/cpp/main/include/config.h b/core/src/main/cpp/main/include/config.h similarity index 84% rename from edxp-core/src/main/cpp/main/include/config.h rename to core/src/main/cpp/main/include/config.h index 8c808151..7e488eb6 100644 --- a/edxp-core/src/main/cpp/main/include/config.h +++ b/core/src/main/cpp/main/include/config.h @@ -7,7 +7,7 @@ #include "art/base/macros.h" #include "utils.h" -namespace edxp { +namespace lspd { //#define LOG_DISABLED //#define DEBUG @@ -29,8 +29,8 @@ inline constexpr bool is64 = Is64(); # define LP_SELECT(lp32, lp64) lp32 #endif - static const auto kEntryClassName = "com.elderdrivers.riru.edxp.core.Main"s; - static const auto kClassLinkerClassName = "com.elderdrivers.riru.edxp.art.ClassLinker"s; + static const auto kEntryClassName = "io.github.lsposed.lspd.core.Main"s; + static const auto kClassLinkerClassName = "io.github.lsposed.lspd.art.ClassLinker"s; static const auto kSandHookClassName = "com.swift.sandhook.SandHook"s; static const auto kSandHookNeverCallClassName = "com.swift.sandhook.ClassNeverCall"s; diff --git a/edxp-core/src/main/cpp/main/include/dl_util.h b/core/src/main/cpp/main/include/dl_util.h similarity index 94% rename from edxp-core/src/main/cpp/main/include/dl_util.h rename to core/src/main/cpp/main/include/dl_util.h index 6eb05079..471698d0 100644 --- a/edxp-core/src/main/cpp/main/include/dl_util.h +++ b/core/src/main/cpp/main/include/dl_util.h @@ -4,7 +4,7 @@ #include #include "logging.h" -namespace edxp { +namespace lspd { inline static void *DlOpen(const char *file) { void *handle = dlopen(file, RTLD_LAZY | RTLD_GLOBAL); @@ -45,7 +45,7 @@ namespace edxp { template T DlSym(const char *sym_name) const { - return edxp::DlSym(handle_, sym_name); + return lspd::DlSym(handle_, sym_name); } bool IsValid() const { diff --git a/edxp-core/src/main/cpp/main/include/framework/androidfw/ResourceTypes.h b/core/src/main/cpp/main/include/framework/androidfw/ResourceTypes.h similarity index 100% rename from edxp-core/src/main/cpp/main/include/framework/androidfw/ResourceTypes.h rename to core/src/main/cpp/main/include/framework/androidfw/ResourceTypes.h diff --git a/edxp-core/src/main/cpp/main/include/logging.h b/core/src/main/cpp/main/include/logging.h similarity index 96% rename from edxp-core/src/main/cpp/main/include/logging.h rename to core/src/main/cpp/main/include/logging.h index 5c7625b4..f4785ad0 100644 --- a/edxp-core/src/main/cpp/main/include/logging.h +++ b/core/src/main/cpp/main/include/logging.h @@ -4,7 +4,7 @@ #include #ifndef LOG_TAG -#define LOG_TAG "EdXposed" +#define LOG_TAG "LSPosed" #endif #ifdef LOG_DISABLED diff --git a/edxp-core/src/main/cpp/main/include/native_util.h b/core/src/main/cpp/main/include/native_util.h similarity index 92% rename from edxp-core/src/main/cpp/main/include/native_util.h rename to core/src/main/cpp/main/include/native_util.h index 35ac1eb0..c2671e83 100644 --- a/edxp-core/src/main/cpp/main/include/native_util.h +++ b/core/src/main/cpp/main/include/native_util.h @@ -3,13 +3,13 @@ #pragma clang diagnostic ignored "-Wunused-value" #pragma once -#include +#include #include #include #include #include "JNIHelper.h" -namespace edxp { +namespace lspd { ALWAYS_INLINE inline void RegisterNativeMethodsInternal(JNIEnv *env, const char *class_name, @@ -29,6 +29,6 @@ namespace edxp { #define REGISTER_EDXP_NATIVE_METHODS(class_name) \ RegisterNativeMethodsInternal(env, (class_name), gMethods, arraysize(gMethods)) -} // namespace edxp +} // namespace lspd #pragma clang diagnostic pop \ No newline at end of file diff --git a/edxp-core/src/main/cpp/main/include/utils.h b/core/src/main/cpp/main/include/utils.h similarity index 99% rename from edxp-core/src/main/cpp/main/include/utils.h rename to core/src/main/cpp/main/include/utils.h index 393c344f..2525d8df 100644 --- a/edxp-core/src/main/cpp/main/include/utils.h +++ b/core/src/main/cpp/main/include/utils.h @@ -10,7 +10,7 @@ #include #include "logging.h" -namespace edxp { +namespace lspd { using namespace std::literals::string_literals; static inline int32_t GetAndroidApiLevel() { diff --git a/edxp-core/src/main/cpp/main/src/config_manager.cpp b/core/src/main/cpp/main/src/config_manager.cpp similarity index 98% rename from edxp-core/src/main/cpp/main/src/config_manager.cpp rename to core/src/main/cpp/main/src/config_manager.cpp index 10119e98..0a9446c7 100644 --- a/edxp-core/src/main/cpp/main/src/config_manager.cpp +++ b/core/src/main/cpp/main/src/config_manager.cpp @@ -23,7 +23,7 @@ /* * Logic: - * check if /data/adb/edxp exists and is readable, if so, read misc_path and the config base path is + * check if /data/adb/lspd exists and is readable, if so, read misc_path and the config base path is * /data/misc/$misc_path; if not so, fall back to the installer's path * config manager is const. and it should be updated if the module list is updated * each user owns one config manager @@ -36,7 +36,7 @@ * dynamic mode is always on * * Permission: - * /data/adb/edxp should be accessible by zygote by sepolicy + * /data/adb/lspd should be accessible by zygote by sepolicy * /data/misc/$misc_path is random path, and mounted by magisk * it should have context `u:object_r:shell_data_file:s0`, which should be readable by normal app * and zygote @@ -71,17 +71,17 @@ * * Side effect: * data exists if the module uninstalled - * One way to release the storage space is to uninstall edxp + * One way to release the storage space is to uninstall lspd * because /data/misc/$misc_path is mounted by magisk. * - * edxp works without manager + * lspd works without manager * * uninstall removes all configs (this can be restored if manager store another copy * of the conf on its own data dir) * */ -namespace edxp { +namespace lspd { namespace fs = std::filesystem; fs::path ConfigManager::RetrieveBaseConfigPath() const { @@ -354,7 +354,7 @@ namespace edxp { } void ConfigManager::Init() { - fs::path misc_path("/data/adb/edxp/misc_path"); + fs::path misc_path("/data/adb/lspd/misc_path"); try { RirudSocket rirud_socket{}; auto path = rirud_socket.ReadFile(misc_path); diff --git a/edxp-core/src/main/cpp/main/src/config_manager.h b/core/src/main/cpp/main/src/config_manager.h similarity index 92% rename from edxp-core/src/main/cpp/main/src/config_manager.h rename to core/src/main/cpp/main/src/config_manager.h index 91ab1b54..aaa8ea98 100644 --- a/edxp-core/src/main/cpp/main/src/config_manager.h +++ b/core/src/main/cpp/main/src/config_manager.h @@ -12,13 +12,13 @@ #include "config.h" #include "utils.h" -namespace edxp { +namespace lspd { class ConfigManager { private: - inline static const auto kPrimaryInstallerPkgName = "org.meowcat.edxposed.manager"s; + inline static const auto kPrimaryInstallerPkgName = "io.github.lsposed.manager"s; inline static const auto kXposedPropName = "edconfig.jar"s; - inline static const auto kXposedInjectDexPath = "edxp.dex"; + inline static const auto kXposedInjectDexPath = "lspd.dex"; public: static void Init(); @@ -67,10 +67,10 @@ namespace edxp { } inline static auto GetLibSandHookName() { - if constexpr(edxp::is64) - return GetFrameworkPath("lib64/libsandhook.edxp.so"); + if constexpr(lspd::is64) + return GetFrameworkPath("lib64/libsandhook.lspd.so"); else - return GetFrameworkPath("lib/libsandhook.edxp.so"); + return GetFrameworkPath("lib/libsandhook.lspd.so"); } inline auto GetXposedPropPath() const { return GetFrameworkPath(kXposedPropName); } @@ -109,13 +109,13 @@ namespace edxp { private: inline static std::unordered_map> instances_{}; inline static uid_t current_user_ = 0u; - inline static std::filesystem::path misc_path_; // /data/misc/edxp_xxxx + inline static std::filesystem::path misc_path_; // /data/misc/lspd_xxxx inline static std::filesystem::path inject_dex_path_; const uid_t user_; const int variant_; const std::filesystem::path data_path_prefix_; // /data/user_de/{user} - const std::filesystem::path base_config_path_; // /data/misc/edxp_xxxx/{user} + const std::filesystem::path base_config_path_; // /data/misc/lspd_xxxx/{user} const bool initialized_ = false; const std::filesystem::path installer_pkg_name_; const bool white_list_enable_ = false; @@ -153,5 +153,5 @@ namespace edxp { static int GetVariant(const std::filesystem::path &dir); }; -} // namespace edxp +} // namespace lspd diff --git a/edxp-core/src/main/cpp/main/src/edxp_context.cpp b/core/src/main/cpp/main/src/context.cpp similarity index 97% rename from edxp-core/src/main/cpp/main/src/edxp_context.cpp rename to core/src/main/cpp/main/src/context.cpp index 898a970e..7566752e 100644 --- a/edxp-core/src/main/cpp/main/src/edxp_context.cpp +++ b/core/src/main/cpp/main/src/context.cpp @@ -2,20 +2,20 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include -#include "edxp_context.h" +#include "context.h" #include "config_manager.h" #include "art/runtime/runtime.h" #include "art/runtime/gc/heap.h" @@ -24,7 +24,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-value" -namespace edxp { +namespace lspd { namespace fs = std::filesystem; constexpr int FIRST_ISOLATED_UID = 99000; @@ -224,7 +224,7 @@ namespace edxp { } void Context::RegisterEdxpService(JNIEnv *env) { - auto path = ConfigManager::GetFrameworkPath("edxp.dex"); + auto path = ConfigManager::GetFrameworkPath("lspd.dex"); std::ifstream is(path, std::ios::binary); if (!is.good()) { LOGE("Cannot load path %s", path.c_str()); @@ -265,7 +265,7 @@ namespace edxp { } auto service_class = (jclass) env->NewGlobalRef( - FindClassFromLoader(env, my_cl, "com.elderdrivers.riru.edxp.service.ServiceProxy")); + FindClassFromLoader(env, my_cl, "io.github.lsposed.lspd.service.ServiceProxy")); if (LIKELY(service_class)) { jfieldID path_fid = JNI_GetStaticFieldID(env, service_class, "CONFIG_PATH", "Ljava/lang/String;"); @@ -280,7 +280,7 @@ namespace edxp { "install", "()V"); if (LIKELY(install_mid)) { JNI_CallStaticVoidMethod(env, service_class, install_mid); - LOGW("Installed EdXposed Service"); + LOGW("Installed LSPosed Service"); } } } diff --git a/edxp-core/src/main/cpp/main/src/edxp_context.h b/core/src/main/cpp/main/src/context.h similarity index 99% rename from edxp-core/src/main/cpp/main/src/edxp_context.h rename to core/src/main/cpp/main/src/context.h index ae174daf..3dba9350 100644 --- a/edxp-core/src/main/cpp/main/src/edxp_context.h +++ b/core/src/main/cpp/main/src/context.h @@ -9,7 +9,7 @@ #include #include "utils.h" -namespace edxp { +namespace lspd { enum Variant { NONE = 0, YAHFA = 1, diff --git a/edxp-core/src/main/cpp/main/src/jni/art_class_linker.cpp b/core/src/main/cpp/main/src/jni/art_class_linker.cpp similarity index 98% rename from edxp-core/src/main/cpp/main/src/jni/art_class_linker.cpp rename to core/src/main/cpp/main/src/jni/art_class_linker.cpp index ce29ee80..b5df1eda 100644 --- a/edxp-core/src/main/cpp/main/src/jni/art_class_linker.cpp +++ b/core/src/main/cpp/main/src/jni/art_class_linker.cpp @@ -7,7 +7,7 @@ #include #include "art_class_linker.h" -namespace edxp { +namespace lspd { static std::unordered_set deopted_methods; diff --git a/edxp-core/src/main/cpp/main/src/jni/art_class_linker.h b/core/src/main/cpp/main/src/jni/art_class_linker.h similarity index 61% rename from edxp-core/src/main/cpp/main/src/jni/art_class_linker.h rename to core/src/main/cpp/main/src/jni/art_class_linker.h index 3e3b013c..00e76f1e 100644 --- a/edxp-core/src/main/cpp/main/src/jni/art_class_linker.h +++ b/core/src/main/cpp/main/src/jni/art_class_linker.h @@ -1,8 +1,8 @@ #pragma once -namespace edxp { +namespace lspd { void RegisterArtClassLinker(JNIEnv *); -} // namespace edxp +} // namespace lspd diff --git a/edxp-core/src/main/cpp/main/src/jni/art_heap.cpp b/core/src/main/cpp/main/src/jni/art_heap.cpp similarity index 86% rename from edxp-core/src/main/cpp/main/src/jni/art_heap.cpp rename to core/src/main/cpp/main/src/jni/art_heap.cpp index d9cc3570..83297044 100644 --- a/edxp-core/src/main/cpp/main/src/jni/art_heap.cpp +++ b/core/src/main/cpp/main/src/jni/art_heap.cpp @@ -6,7 +6,7 @@ #include #include "art_heap.h" -namespace edxp { +namespace lspd { static jint Heap_waitForGcToComplete(JNI_START) { @@ -20,7 +20,7 @@ namespace edxp { }; void RegisterArtHeap(JNIEnv *env) { - REGISTER_EDXP_NATIVE_METHODS("com.elderdrivers.riru.edxp.art.Heap"); + REGISTER_EDXP_NATIVE_METHODS("io.github.lsposed.lspd.art.Heap"); } } \ No newline at end of file diff --git a/edxp-core/src/main/cpp/main/src/jni/art_heap.h b/core/src/main/cpp/main/src/jni/art_heap.h similarity index 58% rename from edxp-core/src/main/cpp/main/src/jni/art_heap.h rename to core/src/main/cpp/main/src/jni/art_heap.h index 1bb69ab1..a8b792be 100644 --- a/edxp-core/src/main/cpp/main/src/jni/art_heap.h +++ b/core/src/main/cpp/main/src/jni/art_heap.h @@ -1,8 +1,8 @@ #pragma once -namespace edxp { +namespace lspd { void RegisterArtHeap(JNIEnv *); -} // namespace edxp +} // namespace lspd diff --git a/edxp-core/src/main/cpp/main/src/jni/edxp_config_manager.cpp b/core/src/main/cpp/main/src/jni/config_manager.cpp similarity index 94% rename from edxp-core/src/main/cpp/main/src/jni/edxp_config_manager.cpp rename to core/src/main/cpp/main/src/jni/config_manager.cpp index 7a718ba1..55c47045 100644 --- a/edxp-core/src/main/cpp/main/src/jni/edxp_config_manager.cpp +++ b/core/src/main/cpp/main/src/jni/config_manager.cpp @@ -3,9 +3,9 @@ #include #include #include -#include "edxp_config_manager.h" +#include "config_manager.h" -namespace edxp { +namespace lspd { static jboolean ConfigManager_isResourcesHookEnabled(JNI_START) { return (jboolean) ConfigManager::GetInstance()->IsResourcesHookEnabled(); @@ -20,7 +20,7 @@ namespace edxp { } static jstring ConfigManager_getLibSandHookName(JNI_START) { - return env->NewStringUTF(ConfigManager::GetInstance()->GetLibSandHookName().c_str()); + return env->NewStringUTF(ConfigManager::GetLibSandHookName().c_str()); } static jstring ConfigManager_getDataPathPrefix(JNI_START) { @@ -84,7 +84,7 @@ namespace edxp { }; void RegisterConfigManagerMethods(JNIEnv *env) { - REGISTER_EDXP_NATIVE_METHODS("com.elderdrivers.riru.edxp.config.ConfigManager"); + REGISTER_EDXP_NATIVE_METHODS("io.github.lsposed.lspd.config.ConfigManager"); } } \ No newline at end of file diff --git a/edxp-core/src/main/cpp/main/src/jni/edxp_config_manager.h b/core/src/main/cpp/main/src/jni/config_manager.h similarity index 83% rename from edxp-core/src/main/cpp/main/src/jni/edxp_config_manager.h rename to core/src/main/cpp/main/src/jni/config_manager.h index 54912336..31112706 100644 --- a/edxp-core/src/main/cpp/main/src/jni/edxp_config_manager.h +++ b/core/src/main/cpp/main/src/jni/config_manager.h @@ -3,7 +3,7 @@ #include "jni.h" -namespace edxp { +namespace lspd { void RegisterConfigManagerMethods(JNIEnv *env); diff --git a/edxp-core/src/main/cpp/main/src/jni/edxp_pending_hooks.cpp b/core/src/main/cpp/main/src/jni/pending_hooks.cpp similarity index 96% rename from edxp-core/src/main/cpp/main/src/jni/edxp_pending_hooks.cpp rename to core/src/main/cpp/main/src/jni/pending_hooks.cpp index e490c99b..19563238 100644 --- a/edxp-core/src/main/cpp/main/src/jni/edxp_pending_hooks.cpp +++ b/core/src/main/cpp/main/src/jni/pending_hooks.cpp @@ -5,11 +5,11 @@ #include "HookMain.h" #include "jni.h" #include "native_util.h" -#include "edxp_pending_hooks.h" +#include "pending_hooks.h" #include "art/runtime/thread.h" #include "art/runtime/mirror/class.h" -namespace edxp { +namespace lspd { static std::unordered_set pending_classes_; diff --git a/edxp-core/src/main/cpp/main/src/jni/edxp_pending_hooks.h b/core/src/main/cpp/main/src/jni/pending_hooks.h similarity index 83% rename from edxp-core/src/main/cpp/main/src/jni/edxp_pending_hooks.h rename to core/src/main/cpp/main/src/jni/pending_hooks.h index 81420577..579b75e2 100644 --- a/edxp-core/src/main/cpp/main/src/jni/edxp_pending_hooks.h +++ b/core/src/main/cpp/main/src/jni/pending_hooks.h @@ -3,7 +3,7 @@ #include "jni.h" -namespace edxp { +namespace lspd { bool IsClassPending(void *); @@ -13,4 +13,4 @@ namespace edxp { void recordHooked(void* art_method); -} // namespace edxp +} // namespace lspd diff --git a/edxp-core/src/main/cpp/main/src/jni/edxp_resources_hook.cpp b/core/src/main/cpp/main/src/jni/resources_hook.cpp similarity index 89% rename from edxp-core/src/main/cpp/main/src/jni/edxp_resources_hook.cpp rename to core/src/main/cpp/main/src/jni/resources_hook.cpp index a426f78a..6f8ab75f 100644 --- a/edxp-core/src/main/cpp/main/src/jni/edxp_resources_hook.cpp +++ b/core/src/main/cpp/main/src/jni/resources_hook.cpp @@ -3,9 +3,9 @@ #include #include #include -#include "edxp_resources_hook.h" +#include "resources_hook.h" -namespace edxp { +namespace lspd { static jboolean ResourcesHook_initXResourcesNative(JNI_START) { return XposedBridge_initXResourcesNative(env, clazz); @@ -30,7 +30,7 @@ namespace edxp { }; void RegisterEdxpResourcesHook(JNIEnv *env) { - REGISTER_EDXP_NATIVE_METHODS("com.elderdrivers.riru.edxp.core.ResourcesHook"); + REGISTER_EDXP_NATIVE_METHODS("io.github.lsposed.lspd.core.ResourcesHook"); } } \ No newline at end of file diff --git a/edxp-core/src/main/cpp/main/src/jni/edxp_resources_hook.h b/core/src/main/cpp/main/src/jni/resources_hook.h similarity index 78% rename from edxp-core/src/main/cpp/main/src/jni/edxp_resources_hook.h rename to core/src/main/cpp/main/src/jni/resources_hook.h index 74461c9b..6303720a 100644 --- a/edxp-core/src/main/cpp/main/src/jni/edxp_resources_hook.h +++ b/core/src/main/cpp/main/src/jni/resources_hook.h @@ -3,10 +3,10 @@ #include "jni.h" -namespace edxp { +namespace lspd { static constexpr uint32_t kAccFinal = 0x0010; void RegisterEdxpResourcesHook(JNIEnv *); -} // namespace edxp +} // namespace lspd diff --git a/edxp-core/src/main/cpp/main/src/jni/edxp_yahfa.cpp b/core/src/main/cpp/main/src/jni/yahfa.cpp similarity index 86% rename from edxp-core/src/main/cpp/main/src/jni/edxp_yahfa.cpp rename to core/src/main/cpp/main/src/jni/yahfa.cpp index 06145957..f2f0d43b 100644 --- a/edxp-core/src/main/cpp/main/src/jni/edxp_yahfa.cpp +++ b/core/src/main/cpp/main/src/jni/yahfa.cpp @@ -3,11 +3,11 @@ #include #include "jni.h" #include "native_util.h" -#include "edxp_yahfa.h" -#include "edxp_pending_hooks.h" +#include "yahfa.h" +#include "pending_hooks.h" #include "art/runtime/class_linker.h" -namespace edxp { +namespace lspd { static void Yahfa_init(JNI_START, jint sdkVersion) { Java_lab_galaxy_yahfa_HookMain_init(env, clazz, sdkVersion); @@ -25,11 +25,11 @@ namespace edxp { } static void Yahfa_recordHooked(JNI_START, jobject member) { - edxp::recordHooked(getArtMethod(env, member)); + lspd::recordHooked(getArtMethod(env, member)); } static jboolean Yahfa_isHooked(JNI_START, jobject member) { - return edxp::isHooked(getArtMethod(env, member)); + return lspd::isHooked(getArtMethod(env, member)); } static JNINativeMethod gMethods[] = { @@ -43,7 +43,7 @@ namespace edxp { }; void RegisterEdxpYahfa(JNIEnv *env) { - REGISTER_EDXP_NATIVE_METHODS("com.elderdrivers.riru.edxp.core.Yahfa"); + REGISTER_EDXP_NATIVE_METHODS("io.github.lsposed.lspd.core.Yahfa"); } } \ No newline at end of file diff --git a/edxp-core/src/main/cpp/main/src/jni/edxp_yahfa.h b/core/src/main/cpp/main/src/jni/yahfa.h similarity index 66% rename from edxp-core/src/main/cpp/main/src/jni/edxp_yahfa.h rename to core/src/main/cpp/main/src/jni/yahfa.h index 10f7252d..654eb46b 100644 --- a/edxp-core/src/main/cpp/main/src/jni/edxp_yahfa.h +++ b/core/src/main/cpp/main/src/jni/yahfa.h @@ -3,8 +3,8 @@ #include "jni.h" -namespace edxp { +namespace lspd { void RegisterEdxpYahfa(JNIEnv *); -} // namespace edxp +} // namespace lspd diff --git a/edxp-core/src/main/cpp/main/src/main.cpp b/core/src/main/cpp/main/src/main.cpp similarity index 90% rename from edxp-core/src/main/cpp/main/src/main.cpp rename to core/src/main/cpp/main/src/main.cpp index 3e8e785a..266238ed 100644 --- a/edxp-core/src/main/cpp/main/src/main.cpp +++ b/core/src/main/cpp/main/src/main.cpp @@ -13,7 +13,7 @@ #include #include "logging.h" #include "config.h" -#include "edxp_context.h" +#include "context.h" #include #include "config_manager.h" #include "native_hook.h" @@ -21,9 +21,9 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-value" -namespace edxp { +namespace lspd { static void onModuleLoaded() { - LOGI("onModuleLoaded: welcome to EdXposed!"); + LOGI("onModuleLoaded: welcome to LSPosed!"); // rirud must be used in onModuleLoaded ConfigManager::Init(); } @@ -120,14 +120,14 @@ RIRU_EXPORT void *init(void *arg) { module->version = RIRU_MODULE_VERSION; module->versionName = STRINGIFY(RIRU_MODULE_VERSION_NAME); - module->onModuleLoaded = edxp::onModuleLoaded; - module->shouldSkipUid = edxp::shouldSkipUid; - module->forkAndSpecializePre = edxp::nativeForkAndSpecializePre; - module->forkAndSpecializePost = edxp::nativeForkAndSpecializePost; - module->specializeAppProcessPre = edxp::specializeAppProcessPre; - module->specializeAppProcessPost = edxp::specializeAppProcessPost; - module->forkSystemServerPre = edxp::nativeForkSystemServerPre; - module->forkSystemServerPost = edxp::nativeForkSystemServerPost; + module->onModuleLoaded = lspd::onModuleLoaded; + module->shouldSkipUid = lspd::shouldSkipUid; + module->forkAndSpecializePre = lspd::nativeForkAndSpecializePre; + module->forkAndSpecializePost = lspd::nativeForkAndSpecializePost; + module->specializeAppProcessPre = lspd::specializeAppProcessPre; + module->specializeAppProcessPost = lspd::specializeAppProcessPost; + module->forkSystemServerPre = lspd::nativeForkSystemServerPre; + module->forkSystemServerPost = lspd::nativeForkSystemServerPost; return module; } default: { diff --git a/edxp-core/src/main/cpp/main/src/native_hook.cpp b/core/src/main/cpp/main/src/native_hook.cpp similarity index 99% rename from edxp-core/src/main/cpp/main/src/native_hook.cpp rename to core/src/main/cpp/main/src/native_hook.cpp index 7f2328b3..e895ba80 100644 --- a/edxp-core/src/main/cpp/main/src/native_hook.cpp +++ b/core/src/main/cpp/main/src/native_hook.cpp @@ -23,7 +23,7 @@ std::vector linker_get_solist(); // Dobby but not in .h -namespace edxp { +namespace lspd { static volatile bool installed = false; static volatile bool art_hooks_installed = false; diff --git a/edxp-core/src/main/cpp/main/src/native_hook.h b/core/src/main/cpp/main/src/native_hook.h similarity index 80% rename from edxp-core/src/main/cpp/main/src/native_hook.h rename to core/src/main/cpp/main/src/native_hook.h index 0f8747e3..242c2629 100644 --- a/edxp-core/src/main/cpp/main/src/native_hook.h +++ b/core/src/main/cpp/main/src/native_hook.h @@ -3,7 +3,7 @@ #include -namespace edxp { +namespace lspd { void InstallInlineHooks(); diff --git a/edxp-core/src/main/cpp/main/src/resource_hook.cpp b/core/src/main/cpp/main/src/resource_hook.cpp similarity index 99% rename from edxp-core/src/main/cpp/main/src/resource_hook.cpp rename to core/src/main/cpp/main/src/resource_hook.cpp index ad960f54..37fa2888 100644 --- a/edxp-core/src/main/cpp/main/src/resource_hook.cpp +++ b/core/src/main/cpp/main/src/resource_hook.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ #include "config.h" // @ApiSensitive(Level.HIGH) -namespace edxp { +namespace lspd { static constexpr const char *kXResourcesClassName = "android/content/res/XResources"; diff --git a/edxp-core/src/main/cpp/main/src/resource_hook.h b/core/src/main/cpp/main/src/resource_hook.h similarity index 94% rename from edxp-core/src/main/cpp/main/src/resource_hook.h rename to core/src/main/cpp/main/src/resource_hook.h index d2b061e2..bb92f371 100644 --- a/edxp-core/src/main/cpp/main/src/resource_hook.h +++ b/core/src/main/cpp/main/src/resource_hook.h @@ -3,7 +3,7 @@ #include -namespace edxp { +namespace lspd { jboolean XposedBridge_initXResourcesNative(JNIEnv *env, jclass); diff --git a/edxp-core/src/main/cpp/main/src/riru_hook.cpp b/core/src/main/cpp/main/src/riru_hook.cpp similarity index 97% rename from edxp-core/src/main/cpp/main/src/riru_hook.cpp rename to core/src/main/cpp/main/src/riru_hook.cpp index 45d18f30..715acbf7 100644 --- a/edxp-core/src/main/cpp/main/src/riru_hook.cpp +++ b/core/src/main/cpp/main/src/riru_hook.cpp @@ -11,7 +11,7 @@ #include "utils.h" #include "riru_hook.h" -namespace edxp { +namespace lspd { static int api_level = 0; @@ -47,7 +47,7 @@ namespace edxp { if (api_level == __ANDROID_API_O_MR1__) { // https://android.googlesource.com/platform/art/+/f5516d38736fb97bfd0435ad03bbab17ddabbe4e // Android 8.1 add a fatal check for debugging (removed in Android 9.0), - // which will be triggered by EdXposed in cases where target method is hooked + // which will be triggered by LSPosed in cases where target method is hooked // (native flag set) after it has been called several times(getCounter() return positive number) if (strcmp(kPropKeyUseJitProfiles, key) == 0) { strcpy(value, "false"); diff --git a/edxp-core/src/main/cpp/main/src/riru_hook.h b/core/src/main/cpp/main/src/riru_hook.h similarity index 98% rename from edxp-core/src/main/cpp/main/src/riru_hook.h rename to core/src/main/cpp/main/src/riru_hook.h index 01d80456..9ff09ef7 100644 --- a/edxp-core/src/main/cpp/main/src/riru_hook.h +++ b/core/src/main/cpp/main/src/riru_hook.h @@ -16,7 +16,7 @@ static ret (*old_##func)(__VA_ARGS__); \ static ret new_##func(__VA_ARGS__) -namespace edxp { +namespace lspd { // @ApiSensitive(Level.HIGH) static constexpr const char *kPropKeyCompilerFilter = "dalvik.vm.dex2oat-filter"; diff --git a/edxp-core/src/main/cpp/main/src/rirud_socket.cpp b/core/src/main/cpp/main/src/rirud_socket.cpp similarity index 100% rename from edxp-core/src/main/cpp/main/src/rirud_socket.cpp rename to core/src/main/cpp/main/src/rirud_socket.cpp diff --git a/edxp-core/src/main/cpp/main/src/rirud_socket.h b/core/src/main/cpp/main/src/rirud_socket.h similarity index 100% rename from edxp-core/src/main/cpp/main/src/rirud_socket.h rename to core/src/main/cpp/main/src/rirud_socket.h diff --git a/edxp-core/src/main/java/android/app/AndroidAppHelper.java b/core/src/main/java/android/app/AndroidAppHelper.java similarity index 100% rename from edxp-core/src/main/java/android/app/AndroidAppHelper.java rename to core/src/main/java/android/app/AndroidAppHelper.java diff --git a/edxp-core/src/main/java/android/app/package-info.java b/core/src/main/java/android/app/package-info.java similarity index 100% rename from edxp-core/src/main/java/android/app/package-info.java rename to core/src/main/java/android/app/package-info.java diff --git a/edxp-core/src/main/java/android/content/res/XModuleResources.java b/core/src/main/java/android/content/res/XModuleResources.java similarity index 100% rename from edxp-core/src/main/java/android/content/res/XModuleResources.java rename to core/src/main/java/android/content/res/XModuleResources.java diff --git a/edxp-core/src/main/java/android/content/res/XResForwarder.java b/core/src/main/java/android/content/res/XResForwarder.java similarity index 100% rename from edxp-core/src/main/java/android/content/res/XResForwarder.java rename to core/src/main/java/android/content/res/XResForwarder.java diff --git a/edxp-core/src/main/java/android/content/res/XResources.java b/core/src/main/java/android/content/res/XResources.java similarity index 100% rename from edxp-core/src/main/java/android/content/res/XResources.java rename to core/src/main/java/android/content/res/XResources.java diff --git a/edxp-core/src/main/java/android/content/res/package-info.java b/core/src/main/java/android/content/res/package-info.java similarity index 100% rename from edxp-core/src/main/java/android/content/res/package-info.java rename to core/src/main/java/android/content/res/package-info.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/DexCreator.java b/core/src/main/java/de/robv/android/xposed/DexCreator.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/DexCreator.java rename to core/src/main/java/de/robv/android/xposed/DexCreator.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/IModuleContext.java b/core/src/main/java/de/robv/android/xposed/IModuleContext.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/IModuleContext.java rename to core/src/main/java/de/robv/android/xposed/IModuleContext.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/IXposedHookCmdInit.java b/core/src/main/java/de/robv/android/xposed/IXposedHookCmdInit.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/IXposedHookCmdInit.java rename to core/src/main/java/de/robv/android/xposed/IXposedHookCmdInit.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/IXposedHookInitPackageResources.java b/core/src/main/java/de/robv/android/xposed/IXposedHookInitPackageResources.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/IXposedHookInitPackageResources.java rename to core/src/main/java/de/robv/android/xposed/IXposedHookInitPackageResources.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/IXposedHookLoadPackage.java b/core/src/main/java/de/robv/android/xposed/IXposedHookLoadPackage.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/IXposedHookLoadPackage.java rename to core/src/main/java/de/robv/android/xposed/IXposedHookLoadPackage.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/IXposedHookZygoteInit.java b/core/src/main/java/de/robv/android/xposed/IXposedHookZygoteInit.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/IXposedHookZygoteInit.java rename to core/src/main/java/de/robv/android/xposed/IXposedHookZygoteInit.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/IXposedMod.java b/core/src/main/java/de/robv/android/xposed/IXposedMod.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/IXposedMod.java rename to core/src/main/java/de/robv/android/xposed/IXposedMod.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/LspHooker.java b/core/src/main/java/de/robv/android/xposed/LspHooker.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/LspHooker.java rename to core/src/main/java/de/robv/android/xposed/LspHooker.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/PendingHooks.java b/core/src/main/java/de/robv/android/xposed/PendingHooks.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/PendingHooks.java rename to core/src/main/java/de/robv/android/xposed/PendingHooks.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/SELinuxHelper.java b/core/src/main/java/de/robv/android/xposed/SELinuxHelper.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/SELinuxHelper.java rename to core/src/main/java/de/robv/android/xposed/SELinuxHelper.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/XC_MethodHook.java b/core/src/main/java/de/robv/android/xposed/XC_MethodHook.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/XC_MethodHook.java rename to core/src/main/java/de/robv/android/xposed/XC_MethodHook.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/XC_MethodReplacement.java b/core/src/main/java/de/robv/android/xposed/XC_MethodReplacement.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/XC_MethodReplacement.java rename to core/src/main/java/de/robv/android/xposed/XC_MethodReplacement.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/XSharedPreferences.java b/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java similarity index 99% rename from edxp-core/src/main/java/de/robv/android/xposed/XSharedPreferences.java rename to core/src/main/java/de/robv/android/xposed/XSharedPreferences.java index 61092753..68def20a 100644 --- a/edxp-core/src/main/java/de/robv/android/xposed/XSharedPreferences.java +++ b/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java @@ -8,8 +8,8 @@ import android.preference.PreferenceManager; import android.util.Log; import com.android.internal.util.XmlUtils; -import com.elderdrivers.riru.edxp.BuildConfig; -import com.elderdrivers.riru.edxp.util.MetaDataReader; +import io.github.lsposed.lspd.BuildConfig; +import io.github.lsposed.lspd.util.MetaDataReader; import org.xmlpull.v1.XmlPullParserException; diff --git a/edxp-core/src/main/java/de/robv/android/xposed/XposedBridge.java b/core/src/main/java/de/robv/android/xposed/XposedBridge.java similarity index 97% rename from edxp-core/src/main/java/de/robv/android/xposed/XposedBridge.java rename to core/src/main/java/de/robv/android/xposed/XposedBridge.java index be4939e2..d2bf4020 100644 --- a/edxp-core/src/main/java/de/robv/android/xposed/XposedBridge.java +++ b/core/src/main/java/de/robv/android/xposed/XposedBridge.java @@ -4,9 +4,9 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.util.Log; -import com.elderdrivers.riru.edxp.BuildConfig; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.config.EdXpConfigGlobal; +import io.github.lsposed.lspd.BuildConfig; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.config.LSPdConfigGlobal; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Constructor; @@ -50,7 +50,7 @@ public final class XposedBridge { public static final ClassLoader BOOTCLASSLOADER = XposedBridge.class.getClassLoader(); /** @hide */ - public static final String TAG = "EdXposed-Bridge"; + public static final String TAG = "LSPosed-Bridge"; /** @deprecated Use {@link #getXposedVersion()} instead. */ @Deprecated @@ -237,7 +237,7 @@ public final class XposedBridge { } AdditionalHookInfo additionalInfo = new AdditionalHookInfo(callbacks, parameterTypes, returnType); - Member reflectMethod = EdXpConfigGlobal.getHookProvider().findMethodNative(hookMethod); + Member reflectMethod = LSPdConfigGlobal.getHookProvider().findMethodNative(hookMethod); if (reflectMethod != null) { hookMethodNative(reflectMethod, declaringClass, slot, additionalInfo); } else { @@ -259,7 +259,7 @@ public final class XposedBridge { */ @Deprecated public static void unhookMethod(Member hookMethod, XC_MethodHook callback) { - EdXpConfigGlobal.getHookProvider().unhookMethod(hookMethod); + LSPdConfigGlobal.getHookProvider().unhookMethod(hookMethod); CopyOnWriteSortedSet callbacks; synchronized (sHookedMethodCallbacks) { callbacks = sHookedMethodCallbacks.get(hookMethod); @@ -462,7 +462,7 @@ public final class XposedBridge { */ /*package*/ synchronized static void hookMethodNative(final Member method, Class declaringClass, int slot, final Object additionalInfoObj) { - EdXpConfigGlobal.getHookProvider().hookMethod(method, (AdditionalHookInfo) additionalInfoObj); + LSPdConfigGlobal.getHookProvider().hookMethod(method, (AdditionalHookInfo) additionalInfoObj); } private static Object invokeOriginalMethodNative(Member method, long methodId, @@ -470,7 +470,7 @@ public final class XposedBridge { Class returnType, Object thisObject, Object[] args) throws Throwable { - return EdXpConfigGlobal.getHookProvider().invokeOriginalMethod(method, methodId, thisObject, args); + return LSPdConfigGlobal.getHookProvider().invokeOriginalMethod(method, methodId, thisObject, args); } /** @@ -519,7 +519,7 @@ public final class XposedBridge { throw new IllegalArgumentException("method must be of type Method or Constructor"); } - long methodId = EdXpConfigGlobal.getHookProvider().getMethodId(method); + long methodId = LSPdConfigGlobal.getHookProvider().getMethodId(method); return invokeOriginalMethodNative(method, methodId, parameterTypes, returnType, thisObject, args); } @@ -546,7 +546,7 @@ public final class XposedBridge { private static native Object cloneToSubclassNative(Object obj, Class targetClazz); private static void removeFinalFlagNative(Class clazz) { - EdXpConfigGlobal.getHookProvider().removeFinalFlagNative(clazz); + LSPdConfigGlobal.getHookProvider().removeFinalFlagNative(clazz); } // /*package*/ static native void closeFilesBeforeForkNative(); diff --git a/edxp-core/src/main/java/de/robv/android/xposed/XposedHelpers.java b/core/src/main/java/de/robv/android/xposed/XposedHelpers.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/XposedHelpers.java rename to core/src/main/java/de/robv/android/xposed/XposedHelpers.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/XposedInit.java b/core/src/main/java/de/robv/android/xposed/XposedInit.java similarity index 99% rename from edxp-core/src/main/java/de/robv/android/xposed/XposedInit.java rename to core/src/main/java/de/robv/android/xposed/XposedInit.java index c0fdacf9..ae49e725 100644 --- a/edxp-core/src/main/java/de/robv/android/xposed/XposedInit.java +++ b/core/src/main/java/de/robv/android/xposed/XposedInit.java @@ -14,8 +14,8 @@ import android.util.ArraySet; import android.util.Log; import com.android.internal.os.ZygoteInit; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.config.EdXpConfigGlobal; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.config.LSPdConfigGlobal; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -100,7 +100,7 @@ public final class XposedInit { return; } - if (!EdXpConfigGlobal.getHookProvider().initXResourcesNative()) { + if (!LSPdConfigGlobal.getHookProvider().initXResourcesNative()) { Log.e(TAG, "Cannot hook resources"); disableResources = true; return; diff --git a/edxp-core/src/main/java/de/robv/android/xposed/annotation/ApiSensitive.java b/core/src/main/java/de/robv/android/xposed/annotation/ApiSensitive.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/annotation/ApiSensitive.java rename to core/src/main/java/de/robv/android/xposed/annotation/ApiSensitive.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/annotation/Level.java b/core/src/main/java/de/robv/android/xposed/annotation/Level.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/annotation/Level.java rename to core/src/main/java/de/robv/android/xposed/annotation/Level.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/callbacks/IXUnhook.java b/core/src/main/java/de/robv/android/xposed/callbacks/IXUnhook.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/callbacks/IXUnhook.java rename to core/src/main/java/de/robv/android/xposed/callbacks/IXUnhook.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java b/core/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java rename to core/src/main/java/de/robv/android/xposed/callbacks/XC_InitPackageResources.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/callbacks/XC_InitZygote.java b/core/src/main/java/de/robv/android/xposed/callbacks/XC_InitZygote.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/callbacks/XC_InitZygote.java rename to core/src/main/java/de/robv/android/xposed/callbacks/XC_InitZygote.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/callbacks/XC_LayoutInflated.java b/core/src/main/java/de/robv/android/xposed/callbacks/XC_LayoutInflated.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/callbacks/XC_LayoutInflated.java rename to core/src/main/java/de/robv/android/xposed/callbacks/XC_LayoutInflated.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java b/core/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java rename to core/src/main/java/de/robv/android/xposed/callbacks/XC_LoadPackage.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java b/core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java similarity index 97% rename from edxp-core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java rename to core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java index 6e6663d2..e9c20f6f 100644 --- a/edxp-core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java +++ b/core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java @@ -2,7 +2,7 @@ package de.robv.android.xposed.callbacks; import android.os.Bundle; -import com.elderdrivers.riru.edxp.config.EdXpConfigGlobal; +import io.github.lsposed.lspd.config.LSPdConfigGlobal; import java.io.Serializable; @@ -106,7 +106,7 @@ public abstract class XCallback implements Comparable, IModuleContext // deopt methods in system apps or priv-apps, this would be not necessary // only if we found out how to recompile their apks XC_LoadPackage.LoadPackageParam lpp = (XC_LoadPackage.LoadPackageParam) param; - EdXpConfigGlobal.getHookProvider().deoptMethods(lpp.packageName, lpp.classLoader); + LSPdConfigGlobal.getHookProvider().deoptMethods(lpp.packageName, lpp.classLoader); } if (param.callbacks == null) diff --git a/edxp-core/src/main/java/de/robv/android/xposed/callbacks/package-info.java b/core/src/main/java/de/robv/android/xposed/callbacks/package-info.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/callbacks/package-info.java rename to core/src/main/java/de/robv/android/xposed/callbacks/package-info.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/package-info.java b/core/src/main/java/de/robv/android/xposed/package-info.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/package-info.java rename to core/src/main/java/de/robv/android/xposed/package-info.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/services/BaseService.java b/core/src/main/java/de/robv/android/xposed/services/BaseService.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/services/BaseService.java rename to core/src/main/java/de/robv/android/xposed/services/BaseService.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/services/BinderService.java b/core/src/main/java/de/robv/android/xposed/services/BinderService.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/services/BinderService.java rename to core/src/main/java/de/robv/android/xposed/services/BinderService.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/services/DirectAccessService.java b/core/src/main/java/de/robv/android/xposed/services/DirectAccessService.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/services/DirectAccessService.java rename to core/src/main/java/de/robv/android/xposed/services/DirectAccessService.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/services/FileResult.java b/core/src/main/java/de/robv/android/xposed/services/FileResult.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/services/FileResult.java rename to core/src/main/java/de/robv/android/xposed/services/FileResult.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/services/ZygoteService.java b/core/src/main/java/de/robv/android/xposed/services/ZygoteService.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/services/ZygoteService.java rename to core/src/main/java/de/robv/android/xposed/services/ZygoteService.java diff --git a/edxp-core/src/main/java/de/robv/android/xposed/services/package-info.java b/core/src/main/java/de/robv/android/xposed/services/package-info.java similarity index 100% rename from edxp-core/src/main/java/de/robv/android/xposed/services/package-info.java rename to core/src/main/java/de/robv/android/xposed/services/package-info.java diff --git a/edxp-core/src/main/java/external/com/android/dex/Annotation.java b/core/src/main/java/external/com/android/dex/Annotation.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/Annotation.java rename to core/src/main/java/external/com/android/dex/Annotation.java diff --git a/edxp-core/src/main/java/external/com/android/dex/CallSiteId.java b/core/src/main/java/external/com/android/dex/CallSiteId.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/CallSiteId.java rename to core/src/main/java/external/com/android/dex/CallSiteId.java diff --git a/edxp-core/src/main/java/external/com/android/dex/ClassData.java b/core/src/main/java/external/com/android/dex/ClassData.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/ClassData.java rename to core/src/main/java/external/com/android/dex/ClassData.java diff --git a/edxp-core/src/main/java/external/com/android/dex/ClassDef.java b/core/src/main/java/external/com/android/dex/ClassDef.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/ClassDef.java rename to core/src/main/java/external/com/android/dex/ClassDef.java diff --git a/edxp-core/src/main/java/external/com/android/dex/Code.java b/core/src/main/java/external/com/android/dex/Code.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/Code.java rename to core/src/main/java/external/com/android/dex/Code.java diff --git a/edxp-core/src/main/java/external/com/android/dex/Dex.java b/core/src/main/java/external/com/android/dex/Dex.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/Dex.java rename to core/src/main/java/external/com/android/dex/Dex.java diff --git a/edxp-core/src/main/java/external/com/android/dex/DexException.java b/core/src/main/java/external/com/android/dex/DexException.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/DexException.java rename to core/src/main/java/external/com/android/dex/DexException.java diff --git a/edxp-core/src/main/java/external/com/android/dex/DexFormat.java b/core/src/main/java/external/com/android/dex/DexFormat.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/DexFormat.java rename to core/src/main/java/external/com/android/dex/DexFormat.java diff --git a/edxp-core/src/main/java/external/com/android/dex/DexIndexOverflowException.java b/core/src/main/java/external/com/android/dex/DexIndexOverflowException.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/DexIndexOverflowException.java rename to core/src/main/java/external/com/android/dex/DexIndexOverflowException.java diff --git a/edxp-core/src/main/java/external/com/android/dex/EncodedValue.java b/core/src/main/java/external/com/android/dex/EncodedValue.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/EncodedValue.java rename to core/src/main/java/external/com/android/dex/EncodedValue.java diff --git a/edxp-core/src/main/java/external/com/android/dex/EncodedValueCodec.java b/core/src/main/java/external/com/android/dex/EncodedValueCodec.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/EncodedValueCodec.java rename to core/src/main/java/external/com/android/dex/EncodedValueCodec.java diff --git a/edxp-core/src/main/java/external/com/android/dex/EncodedValueReader.java b/core/src/main/java/external/com/android/dex/EncodedValueReader.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/EncodedValueReader.java rename to core/src/main/java/external/com/android/dex/EncodedValueReader.java diff --git a/edxp-core/src/main/java/external/com/android/dex/FieldId.java b/core/src/main/java/external/com/android/dex/FieldId.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/FieldId.java rename to core/src/main/java/external/com/android/dex/FieldId.java diff --git a/edxp-core/src/main/java/external/com/android/dex/Leb128.java b/core/src/main/java/external/com/android/dex/Leb128.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/Leb128.java rename to core/src/main/java/external/com/android/dex/Leb128.java diff --git a/edxp-core/src/main/java/external/com/android/dex/MethodHandle.java b/core/src/main/java/external/com/android/dex/MethodHandle.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/MethodHandle.java rename to core/src/main/java/external/com/android/dex/MethodHandle.java diff --git a/edxp-core/src/main/java/external/com/android/dex/MethodId.java b/core/src/main/java/external/com/android/dex/MethodId.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/MethodId.java rename to core/src/main/java/external/com/android/dex/MethodId.java diff --git a/edxp-core/src/main/java/external/com/android/dex/Mutf8.java b/core/src/main/java/external/com/android/dex/Mutf8.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/Mutf8.java rename to core/src/main/java/external/com/android/dex/Mutf8.java diff --git a/edxp-core/src/main/java/external/com/android/dex/ProtoId.java b/core/src/main/java/external/com/android/dex/ProtoId.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/ProtoId.java rename to core/src/main/java/external/com/android/dex/ProtoId.java diff --git a/edxp-core/src/main/java/external/com/android/dex/SizeOf.java b/core/src/main/java/external/com/android/dex/SizeOf.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/SizeOf.java rename to core/src/main/java/external/com/android/dex/SizeOf.java diff --git a/edxp-core/src/main/java/external/com/android/dex/TableOfContents.java b/core/src/main/java/external/com/android/dex/TableOfContents.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/TableOfContents.java rename to core/src/main/java/external/com/android/dex/TableOfContents.java diff --git a/edxp-core/src/main/java/external/com/android/dex/TypeList.java b/core/src/main/java/external/com/android/dex/TypeList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/TypeList.java rename to core/src/main/java/external/com/android/dex/TypeList.java diff --git a/edxp-core/src/main/java/external/com/android/dex/util/ByteArrayByteInput.java b/core/src/main/java/external/com/android/dex/util/ByteArrayByteInput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/util/ByteArrayByteInput.java rename to core/src/main/java/external/com/android/dex/util/ByteArrayByteInput.java diff --git a/edxp-core/src/main/java/external/com/android/dex/util/ByteInput.java b/core/src/main/java/external/com/android/dex/util/ByteInput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/util/ByteInput.java rename to core/src/main/java/external/com/android/dex/util/ByteInput.java diff --git a/edxp-core/src/main/java/external/com/android/dex/util/ByteOutput.java b/core/src/main/java/external/com/android/dex/util/ByteOutput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/util/ByteOutput.java rename to core/src/main/java/external/com/android/dex/util/ByteOutput.java diff --git a/edxp-core/src/main/java/external/com/android/dex/util/ExceptionWithContext.java b/core/src/main/java/external/com/android/dex/util/ExceptionWithContext.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/util/ExceptionWithContext.java rename to core/src/main/java/external/com/android/dex/util/ExceptionWithContext.java diff --git a/edxp-core/src/main/java/external/com/android/dex/util/FileUtils.java b/core/src/main/java/external/com/android/dex/util/FileUtils.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/util/FileUtils.java rename to core/src/main/java/external/com/android/dex/util/FileUtils.java diff --git a/edxp-core/src/main/java/external/com/android/dex/util/Unsigned.java b/core/src/main/java/external/com/android/dex/util/Unsigned.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dex/util/Unsigned.java rename to core/src/main/java/external/com/android/dex/util/Unsigned.java diff --git a/edxp-core/src/main/java/external/com/android/dx/AnnotationId.java b/core/src/main/java/external/com/android/dx/AnnotationId.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/AnnotationId.java rename to core/src/main/java/external/com/android/dx/AnnotationId.java diff --git a/edxp-core/src/main/java/external/com/android/dx/AppDataDirGuesser.java b/core/src/main/java/external/com/android/dx/AppDataDirGuesser.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/AppDataDirGuesser.java rename to core/src/main/java/external/com/android/dx/AppDataDirGuesser.java diff --git a/edxp-core/src/main/java/external/com/android/dx/BinaryOp.java b/core/src/main/java/external/com/android/dx/BinaryOp.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/BinaryOp.java rename to core/src/main/java/external/com/android/dx/BinaryOp.java diff --git a/edxp-core/src/main/java/external/com/android/dx/Code.java b/core/src/main/java/external/com/android/dx/Code.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/Code.java rename to core/src/main/java/external/com/android/dx/Code.java diff --git a/edxp-core/src/main/java/external/com/android/dx/Comparison.java b/core/src/main/java/external/com/android/dx/Comparison.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/Comparison.java rename to core/src/main/java/external/com/android/dx/Comparison.java diff --git a/edxp-core/src/main/java/external/com/android/dx/Constants.java b/core/src/main/java/external/com/android/dx/Constants.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/Constants.java rename to core/src/main/java/external/com/android/dx/Constants.java diff --git a/edxp-core/src/main/java/external/com/android/dx/DexMaker.java b/core/src/main/java/external/com/android/dx/DexMaker.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/DexMaker.java rename to core/src/main/java/external/com/android/dx/DexMaker.java diff --git a/edxp-core/src/main/java/external/com/android/dx/FieldId.java b/core/src/main/java/external/com/android/dx/FieldId.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/FieldId.java rename to core/src/main/java/external/com/android/dx/FieldId.java diff --git a/edxp-core/src/main/java/external/com/android/dx/Label.java b/core/src/main/java/external/com/android/dx/Label.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/Label.java rename to core/src/main/java/external/com/android/dx/Label.java diff --git a/edxp-core/src/main/java/external/com/android/dx/Local.java b/core/src/main/java/external/com/android/dx/Local.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/Local.java rename to core/src/main/java/external/com/android/dx/Local.java diff --git a/edxp-core/src/main/java/external/com/android/dx/MethodId.java b/core/src/main/java/external/com/android/dx/MethodId.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/MethodId.java rename to core/src/main/java/external/com/android/dx/MethodId.java diff --git a/edxp-core/src/main/java/external/com/android/dx/TypeId.java b/core/src/main/java/external/com/android/dx/TypeId.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/TypeId.java rename to core/src/main/java/external/com/android/dx/TypeId.java diff --git a/edxp-core/src/main/java/external/com/android/dx/TypeList.java b/core/src/main/java/external/com/android/dx/TypeList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/TypeList.java rename to core/src/main/java/external/com/android/dx/TypeList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/UnaryOp.java b/core/src/main/java/external/com/android/dx/UnaryOp.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/UnaryOp.java rename to core/src/main/java/external/com/android/dx/UnaryOp.java diff --git a/edxp-core/src/main/java/external/com/android/dx/Version.java b/core/src/main/java/external/com/android/dx/Version.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/Version.java rename to core/src/main/java/external/com/android/dx/Version.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttAnnotationDefault.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttAnnotationDefault.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttAnnotationDefault.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttAnnotationDefault.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttBootstrapMethods.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttBootstrapMethods.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttBootstrapMethods.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttBootstrapMethods.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttCode.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttCode.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttCode.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttCode.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttConstantValue.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttConstantValue.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttConstantValue.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttConstantValue.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttDeprecated.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttDeprecated.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttDeprecated.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttDeprecated.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttEnclosingMethod.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttEnclosingMethod.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttEnclosingMethod.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttEnclosingMethod.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttExceptions.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttExceptions.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttExceptions.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttExceptions.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttInnerClasses.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttInnerClasses.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttInnerClasses.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttInnerClasses.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttLineNumberTable.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttLineNumberTable.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttLineNumberTable.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttLineNumberTable.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTable.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTable.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTable.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTable.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTypeTable.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTypeTable.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTypeTable.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttLocalVariableTypeTable.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleAnnotations.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleAnnotations.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleAnnotations.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleAnnotations.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttSignature.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttSignature.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttSignature.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttSignature.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttSourceDebugExtension.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttSourceDebugExtension.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttSourceDebugExtension.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttSourceDebugExtension.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttSourceFile.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttSourceFile.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttSourceFile.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttSourceFile.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttSynthetic.java b/core/src/main/java/external/com/android/dx/cf/attrib/AttSynthetic.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/AttSynthetic.java rename to core/src/main/java/external/com/android/dx/cf/attrib/AttSynthetic.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/BaseAnnotations.java b/core/src/main/java/external/com/android/dx/cf/attrib/BaseAnnotations.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/BaseAnnotations.java rename to core/src/main/java/external/com/android/dx/cf/attrib/BaseAnnotations.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/BaseAttribute.java b/core/src/main/java/external/com/android/dx/cf/attrib/BaseAttribute.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/BaseAttribute.java rename to core/src/main/java/external/com/android/dx/cf/attrib/BaseAttribute.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/BaseLocalVariables.java b/core/src/main/java/external/com/android/dx/cf/attrib/BaseLocalVariables.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/BaseLocalVariables.java rename to core/src/main/java/external/com/android/dx/cf/attrib/BaseLocalVariables.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/BaseParameterAnnotations.java b/core/src/main/java/external/com/android/dx/cf/attrib/BaseParameterAnnotations.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/BaseParameterAnnotations.java rename to core/src/main/java/external/com/android/dx/cf/attrib/BaseParameterAnnotations.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/InnerClassList.java b/core/src/main/java/external/com/android/dx/cf/attrib/InnerClassList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/InnerClassList.java rename to core/src/main/java/external/com/android/dx/cf/attrib/InnerClassList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/RawAttribute.java b/core/src/main/java/external/com/android/dx/cf/attrib/RawAttribute.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/RawAttribute.java rename to core/src/main/java/external/com/android/dx/cf/attrib/RawAttribute.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/attrib/package.html b/core/src/main/java/external/com/android/dx/cf/attrib/package.html similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/attrib/package.html rename to core/src/main/java/external/com/android/dx/cf/attrib/package.html diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/BaseMachine.java b/core/src/main/java/external/com/android/dx/cf/code/BaseMachine.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/BaseMachine.java rename to core/src/main/java/external/com/android/dx/cf/code/BaseMachine.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/BasicBlocker.java b/core/src/main/java/external/com/android/dx/cf/code/BasicBlocker.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/BasicBlocker.java rename to core/src/main/java/external/com/android/dx/cf/code/BasicBlocker.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/BootstrapMethodArgumentsList.java b/core/src/main/java/external/com/android/dx/cf/code/BootstrapMethodArgumentsList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/BootstrapMethodArgumentsList.java rename to core/src/main/java/external/com/android/dx/cf/code/BootstrapMethodArgumentsList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/BootstrapMethodsList.java b/core/src/main/java/external/com/android/dx/cf/code/BootstrapMethodsList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/BootstrapMethodsList.java rename to core/src/main/java/external/com/android/dx/cf/code/BootstrapMethodsList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/ByteBlock.java b/core/src/main/java/external/com/android/dx/cf/code/ByteBlock.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/ByteBlock.java rename to core/src/main/java/external/com/android/dx/cf/code/ByteBlock.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/ByteBlockList.java b/core/src/main/java/external/com/android/dx/cf/code/ByteBlockList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/ByteBlockList.java rename to core/src/main/java/external/com/android/dx/cf/code/ByteBlockList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/ByteCatchList.java b/core/src/main/java/external/com/android/dx/cf/code/ByteCatchList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/ByteCatchList.java rename to core/src/main/java/external/com/android/dx/cf/code/ByteCatchList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/ByteOps.java b/core/src/main/java/external/com/android/dx/cf/code/ByteOps.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/ByteOps.java rename to core/src/main/java/external/com/android/dx/cf/code/ByteOps.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/BytecodeArray.java b/core/src/main/java/external/com/android/dx/cf/code/BytecodeArray.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/BytecodeArray.java rename to core/src/main/java/external/com/android/dx/cf/code/BytecodeArray.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/ConcreteMethod.java b/core/src/main/java/external/com/android/dx/cf/code/ConcreteMethod.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/ConcreteMethod.java rename to core/src/main/java/external/com/android/dx/cf/code/ConcreteMethod.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/ExecutionStack.java b/core/src/main/java/external/com/android/dx/cf/code/ExecutionStack.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/ExecutionStack.java rename to core/src/main/java/external/com/android/dx/cf/code/ExecutionStack.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/Frame.java b/core/src/main/java/external/com/android/dx/cf/code/Frame.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/Frame.java rename to core/src/main/java/external/com/android/dx/cf/code/Frame.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/LineNumberList.java b/core/src/main/java/external/com/android/dx/cf/code/LineNumberList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/LineNumberList.java rename to core/src/main/java/external/com/android/dx/cf/code/LineNumberList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/LocalVariableList.java b/core/src/main/java/external/com/android/dx/cf/code/LocalVariableList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/LocalVariableList.java rename to core/src/main/java/external/com/android/dx/cf/code/LocalVariableList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/LocalsArray.java b/core/src/main/java/external/com/android/dx/cf/code/LocalsArray.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/LocalsArray.java rename to core/src/main/java/external/com/android/dx/cf/code/LocalsArray.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/LocalsArraySet.java b/core/src/main/java/external/com/android/dx/cf/code/LocalsArraySet.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/LocalsArraySet.java rename to core/src/main/java/external/com/android/dx/cf/code/LocalsArraySet.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/Machine.java b/core/src/main/java/external/com/android/dx/cf/code/Machine.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/Machine.java rename to core/src/main/java/external/com/android/dx/cf/code/Machine.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/Merger.java b/core/src/main/java/external/com/android/dx/cf/code/Merger.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/Merger.java rename to core/src/main/java/external/com/android/dx/cf/code/Merger.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/OneLocalsArray.java b/core/src/main/java/external/com/android/dx/cf/code/OneLocalsArray.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/OneLocalsArray.java rename to core/src/main/java/external/com/android/dx/cf/code/OneLocalsArray.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/ReturnAddress.java b/core/src/main/java/external/com/android/dx/cf/code/ReturnAddress.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/ReturnAddress.java rename to core/src/main/java/external/com/android/dx/cf/code/ReturnAddress.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/Ropper.java b/core/src/main/java/external/com/android/dx/cf/code/Ropper.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/Ropper.java rename to core/src/main/java/external/com/android/dx/cf/code/Ropper.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/RopperMachine.java b/core/src/main/java/external/com/android/dx/cf/code/RopperMachine.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/RopperMachine.java rename to core/src/main/java/external/com/android/dx/cf/code/RopperMachine.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/SimException.java b/core/src/main/java/external/com/android/dx/cf/code/SimException.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/SimException.java rename to core/src/main/java/external/com/android/dx/cf/code/SimException.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/Simulator.java b/core/src/main/java/external/com/android/dx/cf/code/Simulator.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/Simulator.java rename to core/src/main/java/external/com/android/dx/cf/code/Simulator.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/SwitchList.java b/core/src/main/java/external/com/android/dx/cf/code/SwitchList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/SwitchList.java rename to core/src/main/java/external/com/android/dx/cf/code/SwitchList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/ValueAwareMachine.java b/core/src/main/java/external/com/android/dx/cf/code/ValueAwareMachine.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/ValueAwareMachine.java rename to core/src/main/java/external/com/android/dx/cf/code/ValueAwareMachine.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/code/package.html b/core/src/main/java/external/com/android/dx/cf/code/package.html similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/code/package.html rename to core/src/main/java/external/com/android/dx/cf/code/package.html diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/cst/ConstantPoolParser.java b/core/src/main/java/external/com/android/dx/cf/cst/ConstantPoolParser.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/cst/ConstantPoolParser.java rename to core/src/main/java/external/com/android/dx/cf/cst/ConstantPoolParser.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/cst/ConstantTags.java b/core/src/main/java/external/com/android/dx/cf/cst/ConstantTags.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/cst/ConstantTags.java rename to core/src/main/java/external/com/android/dx/cf/cst/ConstantTags.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/cst/MethodHandleKind.java b/core/src/main/java/external/com/android/dx/cf/cst/MethodHandleKind.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/cst/MethodHandleKind.java rename to core/src/main/java/external/com/android/dx/cf/cst/MethodHandleKind.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/AnnotationParser.java b/core/src/main/java/external/com/android/dx/cf/direct/AnnotationParser.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/AnnotationParser.java rename to core/src/main/java/external/com/android/dx/cf/direct/AnnotationParser.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/AttributeFactory.java b/core/src/main/java/external/com/android/dx/cf/direct/AttributeFactory.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/AttributeFactory.java rename to core/src/main/java/external/com/android/dx/cf/direct/AttributeFactory.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/AttributeListParser.java b/core/src/main/java/external/com/android/dx/cf/direct/AttributeListParser.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/AttributeListParser.java rename to core/src/main/java/external/com/android/dx/cf/direct/AttributeListParser.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/ClassPathOpener.java b/core/src/main/java/external/com/android/dx/cf/direct/ClassPathOpener.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/ClassPathOpener.java rename to core/src/main/java/external/com/android/dx/cf/direct/ClassPathOpener.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/CodeObserver.java b/core/src/main/java/external/com/android/dx/cf/direct/CodeObserver.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/CodeObserver.java rename to core/src/main/java/external/com/android/dx/cf/direct/CodeObserver.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/DirectClassFile.java b/core/src/main/java/external/com/android/dx/cf/direct/DirectClassFile.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/DirectClassFile.java rename to core/src/main/java/external/com/android/dx/cf/direct/DirectClassFile.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/FieldListParser.java b/core/src/main/java/external/com/android/dx/cf/direct/FieldListParser.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/FieldListParser.java rename to core/src/main/java/external/com/android/dx/cf/direct/FieldListParser.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/MemberListParser.java b/core/src/main/java/external/com/android/dx/cf/direct/MemberListParser.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/MemberListParser.java rename to core/src/main/java/external/com/android/dx/cf/direct/MemberListParser.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/MethodListParser.java b/core/src/main/java/external/com/android/dx/cf/direct/MethodListParser.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/MethodListParser.java rename to core/src/main/java/external/com/android/dx/cf/direct/MethodListParser.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/StdAttributeFactory.java b/core/src/main/java/external/com/android/dx/cf/direct/StdAttributeFactory.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/StdAttributeFactory.java rename to core/src/main/java/external/com/android/dx/cf/direct/StdAttributeFactory.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/direct/package.html b/core/src/main/java/external/com/android/dx/cf/direct/package.html similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/direct/package.html rename to core/src/main/java/external/com/android/dx/cf/direct/package.html diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/Attribute.java b/core/src/main/java/external/com/android/dx/cf/iface/Attribute.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/Attribute.java rename to core/src/main/java/external/com/android/dx/cf/iface/Attribute.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/AttributeList.java b/core/src/main/java/external/com/android/dx/cf/iface/AttributeList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/AttributeList.java rename to core/src/main/java/external/com/android/dx/cf/iface/AttributeList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/ClassFile.java b/core/src/main/java/external/com/android/dx/cf/iface/ClassFile.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/ClassFile.java rename to core/src/main/java/external/com/android/dx/cf/iface/ClassFile.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/Field.java b/core/src/main/java/external/com/android/dx/cf/iface/Field.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/Field.java rename to core/src/main/java/external/com/android/dx/cf/iface/Field.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/FieldList.java b/core/src/main/java/external/com/android/dx/cf/iface/FieldList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/FieldList.java rename to core/src/main/java/external/com/android/dx/cf/iface/FieldList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/HasAttribute.java b/core/src/main/java/external/com/android/dx/cf/iface/HasAttribute.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/HasAttribute.java rename to core/src/main/java/external/com/android/dx/cf/iface/HasAttribute.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/Member.java b/core/src/main/java/external/com/android/dx/cf/iface/Member.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/Member.java rename to core/src/main/java/external/com/android/dx/cf/iface/Member.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/Method.java b/core/src/main/java/external/com/android/dx/cf/iface/Method.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/Method.java rename to core/src/main/java/external/com/android/dx/cf/iface/Method.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/MethodList.java b/core/src/main/java/external/com/android/dx/cf/iface/MethodList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/MethodList.java rename to core/src/main/java/external/com/android/dx/cf/iface/MethodList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/ParseException.java b/core/src/main/java/external/com/android/dx/cf/iface/ParseException.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/ParseException.java rename to core/src/main/java/external/com/android/dx/cf/iface/ParseException.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/ParseObserver.java b/core/src/main/java/external/com/android/dx/cf/iface/ParseObserver.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/ParseObserver.java rename to core/src/main/java/external/com/android/dx/cf/iface/ParseObserver.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/StdAttributeList.java b/core/src/main/java/external/com/android/dx/cf/iface/StdAttributeList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/StdAttributeList.java rename to core/src/main/java/external/com/android/dx/cf/iface/StdAttributeList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/StdField.java b/core/src/main/java/external/com/android/dx/cf/iface/StdField.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/StdField.java rename to core/src/main/java/external/com/android/dx/cf/iface/StdField.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/StdFieldList.java b/core/src/main/java/external/com/android/dx/cf/iface/StdFieldList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/StdFieldList.java rename to core/src/main/java/external/com/android/dx/cf/iface/StdFieldList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/StdMember.java b/core/src/main/java/external/com/android/dx/cf/iface/StdMember.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/StdMember.java rename to core/src/main/java/external/com/android/dx/cf/iface/StdMember.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/StdMethod.java b/core/src/main/java/external/com/android/dx/cf/iface/StdMethod.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/StdMethod.java rename to core/src/main/java/external/com/android/dx/cf/iface/StdMethod.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/StdMethodList.java b/core/src/main/java/external/com/android/dx/cf/iface/StdMethodList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/StdMethodList.java rename to core/src/main/java/external/com/android/dx/cf/iface/StdMethodList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/cf/iface/package.html b/core/src/main/java/external/com/android/dx/cf/iface/package.html similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/cf/iface/package.html rename to core/src/main/java/external/com/android/dx/cf/iface/package.html diff --git a/edxp-core/src/main/java/external/com/android/dx/command/Main.java b/core/src/main/java/external/com/android/dx/command/Main.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/Main.java rename to core/src/main/java/external/com/android/dx/command/Main.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/UsageException.java b/core/src/main/java/external/com/android/dx/command/UsageException.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/UsageException.java rename to core/src/main/java/external/com/android/dx/command/UsageException.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/annotool/AnnotationLister.java b/core/src/main/java/external/com/android/dx/command/annotool/AnnotationLister.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/annotool/AnnotationLister.java rename to core/src/main/java/external/com/android/dx/command/annotool/AnnotationLister.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/annotool/Main.java b/core/src/main/java/external/com/android/dx/command/annotool/Main.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/annotool/Main.java rename to core/src/main/java/external/com/android/dx/command/annotool/Main.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/dexer/DxContext.java b/core/src/main/java/external/com/android/dx/command/dexer/DxContext.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/dexer/DxContext.java rename to core/src/main/java/external/com/android/dx/command/dexer/DxContext.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/dexer/Main.java b/core/src/main/java/external/com/android/dx/command/dexer/Main.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/dexer/Main.java rename to core/src/main/java/external/com/android/dx/command/dexer/Main.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/dump/Args.java b/core/src/main/java/external/com/android/dx/command/dump/Args.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/dump/Args.java rename to core/src/main/java/external/com/android/dx/command/dump/Args.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/dump/BaseDumper.java b/core/src/main/java/external/com/android/dx/command/dump/BaseDumper.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/dump/BaseDumper.java rename to core/src/main/java/external/com/android/dx/command/dump/BaseDumper.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/dump/BlockDumper.java b/core/src/main/java/external/com/android/dx/command/dump/BlockDumper.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/dump/BlockDumper.java rename to core/src/main/java/external/com/android/dx/command/dump/BlockDumper.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/dump/ClassDumper.java b/core/src/main/java/external/com/android/dx/command/dump/ClassDumper.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/dump/ClassDumper.java rename to core/src/main/java/external/com/android/dx/command/dump/ClassDumper.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/dump/DotDumper.java b/core/src/main/java/external/com/android/dx/command/dump/DotDumper.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/dump/DotDumper.java rename to core/src/main/java/external/com/android/dx/command/dump/DotDumper.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/dump/Main.java b/core/src/main/java/external/com/android/dx/command/dump/Main.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/dump/Main.java rename to core/src/main/java/external/com/android/dx/command/dump/Main.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/dump/SsaDumper.java b/core/src/main/java/external/com/android/dx/command/dump/SsaDumper.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/dump/SsaDumper.java rename to core/src/main/java/external/com/android/dx/command/dump/SsaDumper.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/findusages/FindUsages.java b/core/src/main/java/external/com/android/dx/command/findusages/FindUsages.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/findusages/FindUsages.java rename to core/src/main/java/external/com/android/dx/command/findusages/FindUsages.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/findusages/Main.java b/core/src/main/java/external/com/android/dx/command/findusages/Main.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/findusages/Main.java rename to core/src/main/java/external/com/android/dx/command/findusages/Main.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/grep/Grep.java b/core/src/main/java/external/com/android/dx/command/grep/Grep.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/grep/Grep.java rename to core/src/main/java/external/com/android/dx/command/grep/Grep.java diff --git a/edxp-core/src/main/java/external/com/android/dx/command/grep/Main.java b/core/src/main/java/external/com/android/dx/command/grep/Main.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/command/grep/Main.java rename to core/src/main/java/external/com/android/dx/command/grep/Main.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/DexOptions.java b/core/src/main/java/external/com/android/dx/dex/DexOptions.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/DexOptions.java rename to core/src/main/java/external/com/android/dx/dex/DexOptions.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/cf/AttributeTranslator.java b/core/src/main/java/external/com/android/dx/dex/cf/AttributeTranslator.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/cf/AttributeTranslator.java rename to core/src/main/java/external/com/android/dx/dex/cf/AttributeTranslator.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/cf/CfOptions.java b/core/src/main/java/external/com/android/dx/dex/cf/CfOptions.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/cf/CfOptions.java rename to core/src/main/java/external/com/android/dx/dex/cf/CfOptions.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/cf/CfTranslator.java b/core/src/main/java/external/com/android/dx/dex/cf/CfTranslator.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/cf/CfTranslator.java rename to core/src/main/java/external/com/android/dx/dex/cf/CfTranslator.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/cf/CodeStatistics.java b/core/src/main/java/external/com/android/dx/dex/cf/CodeStatistics.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/cf/CodeStatistics.java rename to core/src/main/java/external/com/android/dx/dex/cf/CodeStatistics.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/cf/OptimizerOptions.java b/core/src/main/java/external/com/android/dx/dex/cf/OptimizerOptions.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/cf/OptimizerOptions.java rename to core/src/main/java/external/com/android/dx/dex/cf/OptimizerOptions.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/cf/package.html b/core/src/main/java/external/com/android/dx/dex/cf/package.html similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/cf/package.html rename to core/src/main/java/external/com/android/dx/dex/cf/package.html diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/ArrayData.java b/core/src/main/java/external/com/android/dx/dex/code/ArrayData.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/ArrayData.java rename to core/src/main/java/external/com/android/dx/dex/code/ArrayData.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/BlockAddresses.java b/core/src/main/java/external/com/android/dx/dex/code/BlockAddresses.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/BlockAddresses.java rename to core/src/main/java/external/com/android/dx/dex/code/BlockAddresses.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/CatchBuilder.java b/core/src/main/java/external/com/android/dx/dex/code/CatchBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/CatchBuilder.java rename to core/src/main/java/external/com/android/dx/dex/code/CatchBuilder.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/CatchHandlerList.java b/core/src/main/java/external/com/android/dx/dex/code/CatchHandlerList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/CatchHandlerList.java rename to core/src/main/java/external/com/android/dx/dex/code/CatchHandlerList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/CatchTable.java b/core/src/main/java/external/com/android/dx/dex/code/CatchTable.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/CatchTable.java rename to core/src/main/java/external/com/android/dx/dex/code/CatchTable.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/CodeAddress.java b/core/src/main/java/external/com/android/dx/dex/code/CodeAddress.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/CodeAddress.java rename to core/src/main/java/external/com/android/dx/dex/code/CodeAddress.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/CstInsn.java b/core/src/main/java/external/com/android/dx/dex/code/CstInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/CstInsn.java rename to core/src/main/java/external/com/android/dx/dex/code/CstInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/DalvCode.java b/core/src/main/java/external/com/android/dx/dex/code/DalvCode.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/DalvCode.java rename to core/src/main/java/external/com/android/dx/dex/code/DalvCode.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/DalvInsn.java b/core/src/main/java/external/com/android/dx/dex/code/DalvInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/DalvInsn.java rename to core/src/main/java/external/com/android/dx/dex/code/DalvInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/DalvInsnList.java b/core/src/main/java/external/com/android/dx/dex/code/DalvInsnList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/DalvInsnList.java rename to core/src/main/java/external/com/android/dx/dex/code/DalvInsnList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/Dop.java b/core/src/main/java/external/com/android/dx/dex/code/Dop.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/Dop.java rename to core/src/main/java/external/com/android/dx/dex/code/Dop.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/Dops.java b/core/src/main/java/external/com/android/dx/dex/code/Dops.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/Dops.java rename to core/src/main/java/external/com/android/dx/dex/code/Dops.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/FixedSizeInsn.java b/core/src/main/java/external/com/android/dx/dex/code/FixedSizeInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/FixedSizeInsn.java rename to core/src/main/java/external/com/android/dx/dex/code/FixedSizeInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/HighRegisterPrefix.java b/core/src/main/java/external/com/android/dx/dex/code/HighRegisterPrefix.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/HighRegisterPrefix.java rename to core/src/main/java/external/com/android/dx/dex/code/HighRegisterPrefix.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/InsnFormat.java b/core/src/main/java/external/com/android/dx/dex/code/InsnFormat.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/InsnFormat.java rename to core/src/main/java/external/com/android/dx/dex/code/InsnFormat.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/LocalList.java b/core/src/main/java/external/com/android/dx/dex/code/LocalList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/LocalList.java rename to core/src/main/java/external/com/android/dx/dex/code/LocalList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/LocalSnapshot.java b/core/src/main/java/external/com/android/dx/dex/code/LocalSnapshot.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/LocalSnapshot.java rename to core/src/main/java/external/com/android/dx/dex/code/LocalSnapshot.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/LocalStart.java b/core/src/main/java/external/com/android/dx/dex/code/LocalStart.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/LocalStart.java rename to core/src/main/java/external/com/android/dx/dex/code/LocalStart.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/MultiCstInsn.java b/core/src/main/java/external/com/android/dx/dex/code/MultiCstInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/MultiCstInsn.java rename to core/src/main/java/external/com/android/dx/dex/code/MultiCstInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/OddSpacer.java b/core/src/main/java/external/com/android/dx/dex/code/OddSpacer.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/OddSpacer.java rename to core/src/main/java/external/com/android/dx/dex/code/OddSpacer.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/OutputCollector.java b/core/src/main/java/external/com/android/dx/dex/code/OutputCollector.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/OutputCollector.java rename to core/src/main/java/external/com/android/dx/dex/code/OutputCollector.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/OutputFinisher.java b/core/src/main/java/external/com/android/dx/dex/code/OutputFinisher.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/OutputFinisher.java rename to core/src/main/java/external/com/android/dx/dex/code/OutputFinisher.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/PositionList.java b/core/src/main/java/external/com/android/dx/dex/code/PositionList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/PositionList.java rename to core/src/main/java/external/com/android/dx/dex/code/PositionList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/RopToDop.java b/core/src/main/java/external/com/android/dx/dex/code/RopToDop.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/RopToDop.java rename to core/src/main/java/external/com/android/dx/dex/code/RopToDop.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/RopTranslator.java b/core/src/main/java/external/com/android/dx/dex/code/RopTranslator.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/RopTranslator.java rename to core/src/main/java/external/com/android/dx/dex/code/RopTranslator.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/SimpleInsn.java b/core/src/main/java/external/com/android/dx/dex/code/SimpleInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/SimpleInsn.java rename to core/src/main/java/external/com/android/dx/dex/code/SimpleInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/StdCatchBuilder.java b/core/src/main/java/external/com/android/dx/dex/code/StdCatchBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/StdCatchBuilder.java rename to core/src/main/java/external/com/android/dx/dex/code/StdCatchBuilder.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/SwitchData.java b/core/src/main/java/external/com/android/dx/dex/code/SwitchData.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/SwitchData.java rename to core/src/main/java/external/com/android/dx/dex/code/SwitchData.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/TargetInsn.java b/core/src/main/java/external/com/android/dx/dex/code/TargetInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/TargetInsn.java rename to core/src/main/java/external/com/android/dx/dex/code/TargetInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/VariableSizeInsn.java b/core/src/main/java/external/com/android/dx/dex/code/VariableSizeInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/VariableSizeInsn.java rename to core/src/main/java/external/com/android/dx/dex/code/VariableSizeInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/ZeroSizeInsn.java b/core/src/main/java/external/com/android/dx/dex/code/ZeroSizeInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/ZeroSizeInsn.java rename to core/src/main/java/external/com/android/dx/dex/code/ZeroSizeInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form10t.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form10t.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form10t.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form10t.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form10x.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form10x.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form10x.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form10x.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form11n.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form11n.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form11n.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form11n.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form11x.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form11x.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form11x.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form11x.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form12x.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form12x.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form12x.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form12x.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form20t.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form20t.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form20t.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form20t.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form21c.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form21c.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form21c.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form21c.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form21h.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form21h.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form21h.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form21h.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form21s.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form21s.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form21s.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form21s.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form21t.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form21t.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form21t.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form21t.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22b.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form22b.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22b.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form22b.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22c.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form22c.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22c.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form22c.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22s.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form22s.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22s.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form22s.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22t.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form22t.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22t.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form22t.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22x.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form22x.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form22x.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form22x.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form23x.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form23x.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form23x.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form23x.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form30t.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form30t.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form30t.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form30t.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form31c.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form31c.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form31c.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form31c.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form31i.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form31i.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form31i.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form31i.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form31t.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form31t.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form31t.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form31t.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form32x.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form32x.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form32x.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form32x.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form35c.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form35c.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form35c.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form35c.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form3rc.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form3rc.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form3rc.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form3rc.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form45cc.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form45cc.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form45cc.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form45cc.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form4rcc.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form4rcc.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form4rcc.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form4rcc.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form51l.java b/core/src/main/java/external/com/android/dx/dex/code/form/Form51l.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/Form51l.java rename to core/src/main/java/external/com/android/dx/dex/code/form/Form51l.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/code/form/SpecialFormat.java b/core/src/main/java/external/com/android/dx/dex/code/form/SpecialFormat.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/code/form/SpecialFormat.java rename to core/src/main/java/external/com/android/dx/dex/code/form/SpecialFormat.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationItem.java b/core/src/main/java/external/com/android/dx/dex/file/AnnotationItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationItem.java rename to core/src/main/java/external/com/android/dx/dex/file/AnnotationItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationSetItem.java b/core/src/main/java/external/com/android/dx/dex/file/AnnotationSetItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationSetItem.java rename to core/src/main/java/external/com/android/dx/dex/file/AnnotationSetItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationSetRefItem.java b/core/src/main/java/external/com/android/dx/dex/file/AnnotationSetRefItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationSetRefItem.java rename to core/src/main/java/external/com/android/dx/dex/file/AnnotationSetRefItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationUtils.java b/core/src/main/java/external/com/android/dx/dex/file/AnnotationUtils.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationUtils.java rename to core/src/main/java/external/com/android/dx/dex/file/AnnotationUtils.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationsDirectoryItem.java b/core/src/main/java/external/com/android/dx/dex/file/AnnotationsDirectoryItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/AnnotationsDirectoryItem.java rename to core/src/main/java/external/com/android/dx/dex/file/AnnotationsDirectoryItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/CallSiteIdItem.java b/core/src/main/java/external/com/android/dx/dex/file/CallSiteIdItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/CallSiteIdItem.java rename to core/src/main/java/external/com/android/dx/dex/file/CallSiteIdItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/CallSiteIdsSection.java b/core/src/main/java/external/com/android/dx/dex/file/CallSiteIdsSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/CallSiteIdsSection.java rename to core/src/main/java/external/com/android/dx/dex/file/CallSiteIdsSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/CallSiteItem.java b/core/src/main/java/external/com/android/dx/dex/file/CallSiteItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/CallSiteItem.java rename to core/src/main/java/external/com/android/dx/dex/file/CallSiteItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/CatchStructs.java b/core/src/main/java/external/com/android/dx/dex/file/CatchStructs.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/CatchStructs.java rename to core/src/main/java/external/com/android/dx/dex/file/CatchStructs.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/ClassDataItem.java b/core/src/main/java/external/com/android/dx/dex/file/ClassDataItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/ClassDataItem.java rename to core/src/main/java/external/com/android/dx/dex/file/ClassDataItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/ClassDefItem.java b/core/src/main/java/external/com/android/dx/dex/file/ClassDefItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/ClassDefItem.java rename to core/src/main/java/external/com/android/dx/dex/file/ClassDefItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/ClassDefsSection.java b/core/src/main/java/external/com/android/dx/dex/file/ClassDefsSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/ClassDefsSection.java rename to core/src/main/java/external/com/android/dx/dex/file/ClassDefsSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/CodeItem.java b/core/src/main/java/external/com/android/dx/dex/file/CodeItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/CodeItem.java rename to core/src/main/java/external/com/android/dx/dex/file/CodeItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/DebugInfoConstants.java b/core/src/main/java/external/com/android/dx/dex/file/DebugInfoConstants.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/DebugInfoConstants.java rename to core/src/main/java/external/com/android/dx/dex/file/DebugInfoConstants.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/DebugInfoDecoder.java b/core/src/main/java/external/com/android/dx/dex/file/DebugInfoDecoder.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/DebugInfoDecoder.java rename to core/src/main/java/external/com/android/dx/dex/file/DebugInfoDecoder.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/DebugInfoEncoder.java b/core/src/main/java/external/com/android/dx/dex/file/DebugInfoEncoder.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/DebugInfoEncoder.java rename to core/src/main/java/external/com/android/dx/dex/file/DebugInfoEncoder.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/DebugInfoItem.java b/core/src/main/java/external/com/android/dx/dex/file/DebugInfoItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/DebugInfoItem.java rename to core/src/main/java/external/com/android/dx/dex/file/DebugInfoItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/DexFile.java b/core/src/main/java/external/com/android/dx/dex/file/DexFile.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/DexFile.java rename to core/src/main/java/external/com/android/dx/dex/file/DexFile.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/EncodedArrayItem.java b/core/src/main/java/external/com/android/dx/dex/file/EncodedArrayItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/EncodedArrayItem.java rename to core/src/main/java/external/com/android/dx/dex/file/EncodedArrayItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/EncodedField.java b/core/src/main/java/external/com/android/dx/dex/file/EncodedField.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/EncodedField.java rename to core/src/main/java/external/com/android/dx/dex/file/EncodedField.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/EncodedMember.java b/core/src/main/java/external/com/android/dx/dex/file/EncodedMember.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/EncodedMember.java rename to core/src/main/java/external/com/android/dx/dex/file/EncodedMember.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/EncodedMethod.java b/core/src/main/java/external/com/android/dx/dex/file/EncodedMethod.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/EncodedMethod.java rename to core/src/main/java/external/com/android/dx/dex/file/EncodedMethod.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/FieldAnnotationStruct.java b/core/src/main/java/external/com/android/dx/dex/file/FieldAnnotationStruct.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/FieldAnnotationStruct.java rename to core/src/main/java/external/com/android/dx/dex/file/FieldAnnotationStruct.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/FieldIdItem.java b/core/src/main/java/external/com/android/dx/dex/file/FieldIdItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/FieldIdItem.java rename to core/src/main/java/external/com/android/dx/dex/file/FieldIdItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/FieldIdsSection.java b/core/src/main/java/external/com/android/dx/dex/file/FieldIdsSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/FieldIdsSection.java rename to core/src/main/java/external/com/android/dx/dex/file/FieldIdsSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/HeaderItem.java b/core/src/main/java/external/com/android/dx/dex/file/HeaderItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/HeaderItem.java rename to core/src/main/java/external/com/android/dx/dex/file/HeaderItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/HeaderSection.java b/core/src/main/java/external/com/android/dx/dex/file/HeaderSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/HeaderSection.java rename to core/src/main/java/external/com/android/dx/dex/file/HeaderSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/IdItem.java b/core/src/main/java/external/com/android/dx/dex/file/IdItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/IdItem.java rename to core/src/main/java/external/com/android/dx/dex/file/IdItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/IndexedItem.java b/core/src/main/java/external/com/android/dx/dex/file/IndexedItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/IndexedItem.java rename to core/src/main/java/external/com/android/dx/dex/file/IndexedItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/Item.java b/core/src/main/java/external/com/android/dx/dex/file/Item.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/Item.java rename to core/src/main/java/external/com/android/dx/dex/file/Item.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/ItemType.java b/core/src/main/java/external/com/android/dx/dex/file/ItemType.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/ItemType.java rename to core/src/main/java/external/com/android/dx/dex/file/ItemType.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/MapItem.java b/core/src/main/java/external/com/android/dx/dex/file/MapItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/MapItem.java rename to core/src/main/java/external/com/android/dx/dex/file/MapItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/MemberIdItem.java b/core/src/main/java/external/com/android/dx/dex/file/MemberIdItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/MemberIdItem.java rename to core/src/main/java/external/com/android/dx/dex/file/MemberIdItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/MemberIdsSection.java b/core/src/main/java/external/com/android/dx/dex/file/MemberIdsSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/MemberIdsSection.java rename to core/src/main/java/external/com/android/dx/dex/file/MemberIdsSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/MethodAnnotationStruct.java b/core/src/main/java/external/com/android/dx/dex/file/MethodAnnotationStruct.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/MethodAnnotationStruct.java rename to core/src/main/java/external/com/android/dx/dex/file/MethodAnnotationStruct.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/MethodHandleItem.java b/core/src/main/java/external/com/android/dx/dex/file/MethodHandleItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/MethodHandleItem.java rename to core/src/main/java/external/com/android/dx/dex/file/MethodHandleItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/MethodHandlesSection.java b/core/src/main/java/external/com/android/dx/dex/file/MethodHandlesSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/MethodHandlesSection.java rename to core/src/main/java/external/com/android/dx/dex/file/MethodHandlesSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/MethodIdItem.java b/core/src/main/java/external/com/android/dx/dex/file/MethodIdItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/MethodIdItem.java rename to core/src/main/java/external/com/android/dx/dex/file/MethodIdItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/MethodIdsSection.java b/core/src/main/java/external/com/android/dx/dex/file/MethodIdsSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/MethodIdsSection.java rename to core/src/main/java/external/com/android/dx/dex/file/MethodIdsSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/MixedItemSection.java b/core/src/main/java/external/com/android/dx/dex/file/MixedItemSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/MixedItemSection.java rename to core/src/main/java/external/com/android/dx/dex/file/MixedItemSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/OffsettedItem.java b/core/src/main/java/external/com/android/dx/dex/file/OffsettedItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/OffsettedItem.java rename to core/src/main/java/external/com/android/dx/dex/file/OffsettedItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/ParameterAnnotationStruct.java b/core/src/main/java/external/com/android/dx/dex/file/ParameterAnnotationStruct.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/ParameterAnnotationStruct.java rename to core/src/main/java/external/com/android/dx/dex/file/ParameterAnnotationStruct.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/ProtoIdItem.java b/core/src/main/java/external/com/android/dx/dex/file/ProtoIdItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/ProtoIdItem.java rename to core/src/main/java/external/com/android/dx/dex/file/ProtoIdItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/ProtoIdsSection.java b/core/src/main/java/external/com/android/dx/dex/file/ProtoIdsSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/ProtoIdsSection.java rename to core/src/main/java/external/com/android/dx/dex/file/ProtoIdsSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/Section.java b/core/src/main/java/external/com/android/dx/dex/file/Section.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/Section.java rename to core/src/main/java/external/com/android/dx/dex/file/Section.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/Statistics.java b/core/src/main/java/external/com/android/dx/dex/file/Statistics.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/Statistics.java rename to core/src/main/java/external/com/android/dx/dex/file/Statistics.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/StringDataItem.java b/core/src/main/java/external/com/android/dx/dex/file/StringDataItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/StringDataItem.java rename to core/src/main/java/external/com/android/dx/dex/file/StringDataItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/StringIdItem.java b/core/src/main/java/external/com/android/dx/dex/file/StringIdItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/StringIdItem.java rename to core/src/main/java/external/com/android/dx/dex/file/StringIdItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/StringIdsSection.java b/core/src/main/java/external/com/android/dx/dex/file/StringIdsSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/StringIdsSection.java rename to core/src/main/java/external/com/android/dx/dex/file/StringIdsSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/TypeIdItem.java b/core/src/main/java/external/com/android/dx/dex/file/TypeIdItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/TypeIdItem.java rename to core/src/main/java/external/com/android/dx/dex/file/TypeIdItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/TypeIdsSection.java b/core/src/main/java/external/com/android/dx/dex/file/TypeIdsSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/TypeIdsSection.java rename to core/src/main/java/external/com/android/dx/dex/file/TypeIdsSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/TypeListItem.java b/core/src/main/java/external/com/android/dx/dex/file/TypeListItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/TypeListItem.java rename to core/src/main/java/external/com/android/dx/dex/file/TypeListItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/UniformItemSection.java b/core/src/main/java/external/com/android/dx/dex/file/UniformItemSection.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/UniformItemSection.java rename to core/src/main/java/external/com/android/dx/dex/file/UniformItemSection.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/UniformListItem.java b/core/src/main/java/external/com/android/dx/dex/file/UniformListItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/UniformListItem.java rename to core/src/main/java/external/com/android/dx/dex/file/UniformListItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/dex/file/ValueEncoder.java b/core/src/main/java/external/com/android/dx/dex/file/ValueEncoder.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/dex/file/ValueEncoder.java rename to core/src/main/java/external/com/android/dx/dex/file/ValueEncoder.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/CodeReader.java b/core/src/main/java/external/com/android/dx/io/CodeReader.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/CodeReader.java rename to core/src/main/java/external/com/android/dx/io/CodeReader.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/DexIndexPrinter.java b/core/src/main/java/external/com/android/dx/io/DexIndexPrinter.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/DexIndexPrinter.java rename to core/src/main/java/external/com/android/dx/io/DexIndexPrinter.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/IndexType.java b/core/src/main/java/external/com/android/dx/io/IndexType.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/IndexType.java rename to core/src/main/java/external/com/android/dx/io/IndexType.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/OpcodeInfo.java b/core/src/main/java/external/com/android/dx/io/OpcodeInfo.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/OpcodeInfo.java rename to core/src/main/java/external/com/android/dx/io/OpcodeInfo.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/Opcodes.java b/core/src/main/java/external/com/android/dx/io/Opcodes.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/Opcodes.java rename to core/src/main/java/external/com/android/dx/io/Opcodes.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/AddressMap.java b/core/src/main/java/external/com/android/dx/io/instructions/AddressMap.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/AddressMap.java rename to core/src/main/java/external/com/android/dx/io/instructions/AddressMap.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/BaseCodeCursor.java b/core/src/main/java/external/com/android/dx/io/instructions/BaseCodeCursor.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/BaseCodeCursor.java rename to core/src/main/java/external/com/android/dx/io/instructions/BaseCodeCursor.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/CodeCursor.java b/core/src/main/java/external/com/android/dx/io/instructions/CodeCursor.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/CodeCursor.java rename to core/src/main/java/external/com/android/dx/io/instructions/CodeCursor.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/CodeInput.java b/core/src/main/java/external/com/android/dx/io/instructions/CodeInput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/CodeInput.java rename to core/src/main/java/external/com/android/dx/io/instructions/CodeInput.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/CodeOutput.java b/core/src/main/java/external/com/android/dx/io/instructions/CodeOutput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/CodeOutput.java rename to core/src/main/java/external/com/android/dx/io/instructions/CodeOutput.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/DecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/DecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/DecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/DecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/InstructionCodec.java b/core/src/main/java/external/com/android/dx/io/instructions/InstructionCodec.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/InstructionCodec.java rename to core/src/main/java/external/com/android/dx/io/instructions/InstructionCodec.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicRangeDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicRangeDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicRangeDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/InvokePolymorphicRangeDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeInput.java b/core/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeInput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeInput.java rename to core/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeInput.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeOutput.java b/core/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeOutput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeOutput.java rename to core/src/main/java/external/com/android/dx/io/instructions/ShortArrayCodeOutput.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java b/core/src/main/java/external/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java rename to core/src/main/java/external/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java diff --git a/edxp-core/src/main/java/external/com/android/dx/merge/CollisionPolicy.java b/core/src/main/java/external/com/android/dx/merge/CollisionPolicy.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/merge/CollisionPolicy.java rename to core/src/main/java/external/com/android/dx/merge/CollisionPolicy.java diff --git a/edxp-core/src/main/java/external/com/android/dx/merge/DexMerger.java b/core/src/main/java/external/com/android/dx/merge/DexMerger.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/merge/DexMerger.java rename to core/src/main/java/external/com/android/dx/merge/DexMerger.java diff --git a/edxp-core/src/main/java/external/com/android/dx/merge/IndexMap.java b/core/src/main/java/external/com/android/dx/merge/IndexMap.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/merge/IndexMap.java rename to core/src/main/java/external/com/android/dx/merge/IndexMap.java diff --git a/edxp-core/src/main/java/external/com/android/dx/merge/InstructionTransformer.java b/core/src/main/java/external/com/android/dx/merge/InstructionTransformer.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/merge/InstructionTransformer.java rename to core/src/main/java/external/com/android/dx/merge/InstructionTransformer.java diff --git a/edxp-core/src/main/java/external/com/android/dx/merge/SortableType.java b/core/src/main/java/external/com/android/dx/merge/SortableType.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/merge/SortableType.java rename to core/src/main/java/external/com/android/dx/merge/SortableType.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/annotation/Annotation.java b/core/src/main/java/external/com/android/dx/rop/annotation/Annotation.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/annotation/Annotation.java rename to core/src/main/java/external/com/android/dx/rop/annotation/Annotation.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/annotation/AnnotationVisibility.java b/core/src/main/java/external/com/android/dx/rop/annotation/AnnotationVisibility.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/annotation/AnnotationVisibility.java rename to core/src/main/java/external/com/android/dx/rop/annotation/AnnotationVisibility.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/annotation/Annotations.java b/core/src/main/java/external/com/android/dx/rop/annotation/Annotations.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/annotation/Annotations.java rename to core/src/main/java/external/com/android/dx/rop/annotation/Annotations.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/annotation/AnnotationsList.java b/core/src/main/java/external/com/android/dx/rop/annotation/AnnotationsList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/annotation/AnnotationsList.java rename to core/src/main/java/external/com/android/dx/rop/annotation/AnnotationsList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/annotation/NameValuePair.java b/core/src/main/java/external/com/android/dx/rop/annotation/NameValuePair.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/annotation/NameValuePair.java rename to core/src/main/java/external/com/android/dx/rop/annotation/NameValuePair.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/AccessFlags.java b/core/src/main/java/external/com/android/dx/rop/code/AccessFlags.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/AccessFlags.java rename to core/src/main/java/external/com/android/dx/rop/code/AccessFlags.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/BasicBlock.java b/core/src/main/java/external/com/android/dx/rop/code/BasicBlock.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/BasicBlock.java rename to core/src/main/java/external/com/android/dx/rop/code/BasicBlock.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/BasicBlockList.java b/core/src/main/java/external/com/android/dx/rop/code/BasicBlockList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/BasicBlockList.java rename to core/src/main/java/external/com/android/dx/rop/code/BasicBlockList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/ConservativeTranslationAdvice.java b/core/src/main/java/external/com/android/dx/rop/code/ConservativeTranslationAdvice.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/ConservativeTranslationAdvice.java rename to core/src/main/java/external/com/android/dx/rop/code/ConservativeTranslationAdvice.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/CstInsn.java b/core/src/main/java/external/com/android/dx/rop/code/CstInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/CstInsn.java rename to core/src/main/java/external/com/android/dx/rop/code/CstInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/DexTranslationAdvice.java b/core/src/main/java/external/com/android/dx/rop/code/DexTranslationAdvice.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/DexTranslationAdvice.java rename to core/src/main/java/external/com/android/dx/rop/code/DexTranslationAdvice.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/Exceptions.java b/core/src/main/java/external/com/android/dx/rop/code/Exceptions.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/Exceptions.java rename to core/src/main/java/external/com/android/dx/rop/code/Exceptions.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/FillArrayDataInsn.java b/core/src/main/java/external/com/android/dx/rop/code/FillArrayDataInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/FillArrayDataInsn.java rename to core/src/main/java/external/com/android/dx/rop/code/FillArrayDataInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/Insn.java b/core/src/main/java/external/com/android/dx/rop/code/Insn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/Insn.java rename to core/src/main/java/external/com/android/dx/rop/code/Insn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/InsnList.java b/core/src/main/java/external/com/android/dx/rop/code/InsnList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/InsnList.java rename to core/src/main/java/external/com/android/dx/rop/code/InsnList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/InvokePolymorphicInsn.java b/core/src/main/java/external/com/android/dx/rop/code/InvokePolymorphicInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/InvokePolymorphicInsn.java rename to core/src/main/java/external/com/android/dx/rop/code/InvokePolymorphicInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/LocalItem.java b/core/src/main/java/external/com/android/dx/rop/code/LocalItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/LocalItem.java rename to core/src/main/java/external/com/android/dx/rop/code/LocalItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/LocalVariableExtractor.java b/core/src/main/java/external/com/android/dx/rop/code/LocalVariableExtractor.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/LocalVariableExtractor.java rename to core/src/main/java/external/com/android/dx/rop/code/LocalVariableExtractor.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/LocalVariableInfo.java b/core/src/main/java/external/com/android/dx/rop/code/LocalVariableInfo.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/LocalVariableInfo.java rename to core/src/main/java/external/com/android/dx/rop/code/LocalVariableInfo.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/PlainCstInsn.java b/core/src/main/java/external/com/android/dx/rop/code/PlainCstInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/PlainCstInsn.java rename to core/src/main/java/external/com/android/dx/rop/code/PlainCstInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/PlainInsn.java b/core/src/main/java/external/com/android/dx/rop/code/PlainInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/PlainInsn.java rename to core/src/main/java/external/com/android/dx/rop/code/PlainInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/RegOps.java b/core/src/main/java/external/com/android/dx/rop/code/RegOps.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/RegOps.java rename to core/src/main/java/external/com/android/dx/rop/code/RegOps.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/RegisterSpec.java b/core/src/main/java/external/com/android/dx/rop/code/RegisterSpec.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/RegisterSpec.java rename to core/src/main/java/external/com/android/dx/rop/code/RegisterSpec.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/RegisterSpecList.java b/core/src/main/java/external/com/android/dx/rop/code/RegisterSpecList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/RegisterSpecList.java rename to core/src/main/java/external/com/android/dx/rop/code/RegisterSpecList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/RegisterSpecSet.java b/core/src/main/java/external/com/android/dx/rop/code/RegisterSpecSet.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/RegisterSpecSet.java rename to core/src/main/java/external/com/android/dx/rop/code/RegisterSpecSet.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/Rop.java b/core/src/main/java/external/com/android/dx/rop/code/Rop.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/Rop.java rename to core/src/main/java/external/com/android/dx/rop/code/Rop.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/RopMethod.java b/core/src/main/java/external/com/android/dx/rop/code/RopMethod.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/RopMethod.java rename to core/src/main/java/external/com/android/dx/rop/code/RopMethod.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/Rops.java b/core/src/main/java/external/com/android/dx/rop/code/Rops.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/Rops.java rename to core/src/main/java/external/com/android/dx/rop/code/Rops.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/SourcePosition.java b/core/src/main/java/external/com/android/dx/rop/code/SourcePosition.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/SourcePosition.java rename to core/src/main/java/external/com/android/dx/rop/code/SourcePosition.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/SwitchInsn.java b/core/src/main/java/external/com/android/dx/rop/code/SwitchInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/SwitchInsn.java rename to core/src/main/java/external/com/android/dx/rop/code/SwitchInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/ThrowingCstInsn.java b/core/src/main/java/external/com/android/dx/rop/code/ThrowingCstInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/ThrowingCstInsn.java rename to core/src/main/java/external/com/android/dx/rop/code/ThrowingCstInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/ThrowingInsn.java b/core/src/main/java/external/com/android/dx/rop/code/ThrowingInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/ThrowingInsn.java rename to core/src/main/java/external/com/android/dx/rop/code/ThrowingInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/TranslationAdvice.java b/core/src/main/java/external/com/android/dx/rop/code/TranslationAdvice.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/TranslationAdvice.java rename to core/src/main/java/external/com/android/dx/rop/code/TranslationAdvice.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/code/package.html b/core/src/main/java/external/com/android/dx/rop/code/package.html similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/code/package.html rename to core/src/main/java/external/com/android/dx/rop/code/package.html diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/Constant.java b/core/src/main/java/external/com/android/dx/rop/cst/Constant.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/Constant.java rename to core/src/main/java/external/com/android/dx/rop/cst/Constant.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/ConstantPool.java b/core/src/main/java/external/com/android/dx/rop/cst/ConstantPool.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/ConstantPool.java rename to core/src/main/java/external/com/android/dx/rop/cst/ConstantPool.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstAnnotation.java b/core/src/main/java/external/com/android/dx/rop/cst/CstAnnotation.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstAnnotation.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstAnnotation.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstArray.java b/core/src/main/java/external/com/android/dx/rop/cst/CstArray.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstArray.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstArray.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstBaseMethodRef.java b/core/src/main/java/external/com/android/dx/rop/cst/CstBaseMethodRef.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstBaseMethodRef.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstBaseMethodRef.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstBoolean.java b/core/src/main/java/external/com/android/dx/rop/cst/CstBoolean.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstBoolean.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstBoolean.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstByte.java b/core/src/main/java/external/com/android/dx/rop/cst/CstByte.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstByte.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstByte.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstCallSite.java b/core/src/main/java/external/com/android/dx/rop/cst/CstCallSite.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstCallSite.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstCallSite.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstCallSiteRef.java b/core/src/main/java/external/com/android/dx/rop/cst/CstCallSiteRef.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstCallSiteRef.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstCallSiteRef.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstChar.java b/core/src/main/java/external/com/android/dx/rop/cst/CstChar.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstChar.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstChar.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstDouble.java b/core/src/main/java/external/com/android/dx/rop/cst/CstDouble.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstDouble.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstDouble.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstEnumRef.java b/core/src/main/java/external/com/android/dx/rop/cst/CstEnumRef.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstEnumRef.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstEnumRef.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstFieldRef.java b/core/src/main/java/external/com/android/dx/rop/cst/CstFieldRef.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstFieldRef.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstFieldRef.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstFloat.java b/core/src/main/java/external/com/android/dx/rop/cst/CstFloat.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstFloat.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstFloat.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstInteger.java b/core/src/main/java/external/com/android/dx/rop/cst/CstInteger.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstInteger.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstInteger.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstInterfaceMethodRef.java b/core/src/main/java/external/com/android/dx/rop/cst/CstInterfaceMethodRef.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstInterfaceMethodRef.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstInterfaceMethodRef.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstInvokeDynamic.java b/core/src/main/java/external/com/android/dx/rop/cst/CstInvokeDynamic.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstInvokeDynamic.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstInvokeDynamic.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstKnownNull.java b/core/src/main/java/external/com/android/dx/rop/cst/CstKnownNull.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstKnownNull.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstKnownNull.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstLiteral32.java b/core/src/main/java/external/com/android/dx/rop/cst/CstLiteral32.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstLiteral32.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstLiteral32.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstLiteral64.java b/core/src/main/java/external/com/android/dx/rop/cst/CstLiteral64.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstLiteral64.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstLiteral64.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstLiteralBits.java b/core/src/main/java/external/com/android/dx/rop/cst/CstLiteralBits.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstLiteralBits.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstLiteralBits.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstLong.java b/core/src/main/java/external/com/android/dx/rop/cst/CstLong.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstLong.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstLong.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstMemberRef.java b/core/src/main/java/external/com/android/dx/rop/cst/CstMemberRef.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstMemberRef.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstMemberRef.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstMethodHandle.java b/core/src/main/java/external/com/android/dx/rop/cst/CstMethodHandle.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstMethodHandle.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstMethodHandle.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstMethodRef.java b/core/src/main/java/external/com/android/dx/rop/cst/CstMethodRef.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstMethodRef.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstMethodRef.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstNat.java b/core/src/main/java/external/com/android/dx/rop/cst/CstNat.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstNat.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstNat.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstProtoRef.java b/core/src/main/java/external/com/android/dx/rop/cst/CstProtoRef.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstProtoRef.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstProtoRef.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstShort.java b/core/src/main/java/external/com/android/dx/rop/cst/CstShort.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstShort.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstShort.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstString.java b/core/src/main/java/external/com/android/dx/rop/cst/CstString.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstString.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstString.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/CstType.java b/core/src/main/java/external/com/android/dx/rop/cst/CstType.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/CstType.java rename to core/src/main/java/external/com/android/dx/rop/cst/CstType.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/StdConstantPool.java b/core/src/main/java/external/com/android/dx/rop/cst/StdConstantPool.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/StdConstantPool.java rename to core/src/main/java/external/com/android/dx/rop/cst/StdConstantPool.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/TypedConstant.java b/core/src/main/java/external/com/android/dx/rop/cst/TypedConstant.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/TypedConstant.java rename to core/src/main/java/external/com/android/dx/rop/cst/TypedConstant.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/Zeroes.java b/core/src/main/java/external/com/android/dx/rop/cst/Zeroes.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/Zeroes.java rename to core/src/main/java/external/com/android/dx/rop/cst/Zeroes.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/cst/package.html b/core/src/main/java/external/com/android/dx/rop/cst/package.html similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/cst/package.html rename to core/src/main/java/external/com/android/dx/rop/cst/package.html diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/package-info.java b/core/src/main/java/external/com/android/dx/rop/package-info.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/package-info.java rename to core/src/main/java/external/com/android/dx/rop/package-info.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/type/Prototype.java b/core/src/main/java/external/com/android/dx/rop/type/Prototype.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/type/Prototype.java rename to core/src/main/java/external/com/android/dx/rop/type/Prototype.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/type/StdTypeList.java b/core/src/main/java/external/com/android/dx/rop/type/StdTypeList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/type/StdTypeList.java rename to core/src/main/java/external/com/android/dx/rop/type/StdTypeList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/type/Type.java b/core/src/main/java/external/com/android/dx/rop/type/Type.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/type/Type.java rename to core/src/main/java/external/com/android/dx/rop/type/Type.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/type/TypeBearer.java b/core/src/main/java/external/com/android/dx/rop/type/TypeBearer.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/type/TypeBearer.java rename to core/src/main/java/external/com/android/dx/rop/type/TypeBearer.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/type/TypeList.java b/core/src/main/java/external/com/android/dx/rop/type/TypeList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/type/TypeList.java rename to core/src/main/java/external/com/android/dx/rop/type/TypeList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/rop/type/package.html b/core/src/main/java/external/com/android/dx/rop/type/package.html similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/rop/type/package.html rename to core/src/main/java/external/com/android/dx/rop/type/package.html diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/BasicRegisterMapper.java b/core/src/main/java/external/com/android/dx/ssa/BasicRegisterMapper.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/BasicRegisterMapper.java rename to core/src/main/java/external/com/android/dx/ssa/BasicRegisterMapper.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/ConstCollector.java b/core/src/main/java/external/com/android/dx/ssa/ConstCollector.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/ConstCollector.java rename to core/src/main/java/external/com/android/dx/ssa/ConstCollector.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/DeadCodeRemover.java b/core/src/main/java/external/com/android/dx/ssa/DeadCodeRemover.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/DeadCodeRemover.java rename to core/src/main/java/external/com/android/dx/ssa/DeadCodeRemover.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/DomFront.java b/core/src/main/java/external/com/android/dx/ssa/DomFront.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/DomFront.java rename to core/src/main/java/external/com/android/dx/ssa/DomFront.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/Dominators.java b/core/src/main/java/external/com/android/dx/ssa/Dominators.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/Dominators.java rename to core/src/main/java/external/com/android/dx/ssa/Dominators.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/EscapeAnalysis.java b/core/src/main/java/external/com/android/dx/ssa/EscapeAnalysis.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/EscapeAnalysis.java rename to core/src/main/java/external/com/android/dx/ssa/EscapeAnalysis.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/InterferenceRegisterMapper.java b/core/src/main/java/external/com/android/dx/ssa/InterferenceRegisterMapper.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/InterferenceRegisterMapper.java rename to core/src/main/java/external/com/android/dx/ssa/InterferenceRegisterMapper.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/LiteralOpUpgrader.java b/core/src/main/java/external/com/android/dx/ssa/LiteralOpUpgrader.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/LiteralOpUpgrader.java rename to core/src/main/java/external/com/android/dx/ssa/LiteralOpUpgrader.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/LocalVariableExtractor.java b/core/src/main/java/external/com/android/dx/ssa/LocalVariableExtractor.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/LocalVariableExtractor.java rename to core/src/main/java/external/com/android/dx/ssa/LocalVariableExtractor.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/LocalVariableInfo.java b/core/src/main/java/external/com/android/dx/ssa/LocalVariableInfo.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/LocalVariableInfo.java rename to core/src/main/java/external/com/android/dx/ssa/LocalVariableInfo.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/MoveParamCombiner.java b/core/src/main/java/external/com/android/dx/ssa/MoveParamCombiner.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/MoveParamCombiner.java rename to core/src/main/java/external/com/android/dx/ssa/MoveParamCombiner.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/NormalSsaInsn.java b/core/src/main/java/external/com/android/dx/ssa/NormalSsaInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/NormalSsaInsn.java rename to core/src/main/java/external/com/android/dx/ssa/NormalSsaInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/Optimizer.java b/core/src/main/java/external/com/android/dx/ssa/Optimizer.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/Optimizer.java rename to core/src/main/java/external/com/android/dx/ssa/Optimizer.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/PhiInsn.java b/core/src/main/java/external/com/android/dx/ssa/PhiInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/PhiInsn.java rename to core/src/main/java/external/com/android/dx/ssa/PhiInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/PhiTypeResolver.java b/core/src/main/java/external/com/android/dx/ssa/PhiTypeResolver.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/PhiTypeResolver.java rename to core/src/main/java/external/com/android/dx/ssa/PhiTypeResolver.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/RegisterMapper.java b/core/src/main/java/external/com/android/dx/ssa/RegisterMapper.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/RegisterMapper.java rename to core/src/main/java/external/com/android/dx/ssa/RegisterMapper.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/SCCP.java b/core/src/main/java/external/com/android/dx/ssa/SCCP.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/SCCP.java rename to core/src/main/java/external/com/android/dx/ssa/SCCP.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/SetFactory.java b/core/src/main/java/external/com/android/dx/ssa/SetFactory.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/SetFactory.java rename to core/src/main/java/external/com/android/dx/ssa/SetFactory.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/SsaBasicBlock.java b/core/src/main/java/external/com/android/dx/ssa/SsaBasicBlock.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/SsaBasicBlock.java rename to core/src/main/java/external/com/android/dx/ssa/SsaBasicBlock.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/SsaConverter.java b/core/src/main/java/external/com/android/dx/ssa/SsaConverter.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/SsaConverter.java rename to core/src/main/java/external/com/android/dx/ssa/SsaConverter.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/SsaInsn.java b/core/src/main/java/external/com/android/dx/ssa/SsaInsn.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/SsaInsn.java rename to core/src/main/java/external/com/android/dx/ssa/SsaInsn.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/SsaMethod.java b/core/src/main/java/external/com/android/dx/ssa/SsaMethod.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/SsaMethod.java rename to core/src/main/java/external/com/android/dx/ssa/SsaMethod.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/SsaRenamer.java b/core/src/main/java/external/com/android/dx/ssa/SsaRenamer.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/SsaRenamer.java rename to core/src/main/java/external/com/android/dx/ssa/SsaRenamer.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/back/FirstFitAllocator.java b/core/src/main/java/external/com/android/dx/ssa/back/FirstFitAllocator.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/back/FirstFitAllocator.java rename to core/src/main/java/external/com/android/dx/ssa/back/FirstFitAllocator.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java b/core/src/main/java/external/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java rename to core/src/main/java/external/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/back/IdenticalBlockCombiner.java b/core/src/main/java/external/com/android/dx/ssa/back/IdenticalBlockCombiner.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/back/IdenticalBlockCombiner.java rename to core/src/main/java/external/com/android/dx/ssa/back/IdenticalBlockCombiner.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/back/InterferenceGraph.java b/core/src/main/java/external/com/android/dx/ssa/back/InterferenceGraph.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/back/InterferenceGraph.java rename to core/src/main/java/external/com/android/dx/ssa/back/InterferenceGraph.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/back/LivenessAnalyzer.java b/core/src/main/java/external/com/android/dx/ssa/back/LivenessAnalyzer.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/back/LivenessAnalyzer.java rename to core/src/main/java/external/com/android/dx/ssa/back/LivenessAnalyzer.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/back/NullRegisterAllocator.java b/core/src/main/java/external/com/android/dx/ssa/back/NullRegisterAllocator.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/back/NullRegisterAllocator.java rename to core/src/main/java/external/com/android/dx/ssa/back/NullRegisterAllocator.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/back/RegisterAllocator.java b/core/src/main/java/external/com/android/dx/ssa/back/RegisterAllocator.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/back/RegisterAllocator.java rename to core/src/main/java/external/com/android/dx/ssa/back/RegisterAllocator.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/back/SsaToRop.java b/core/src/main/java/external/com/android/dx/ssa/back/SsaToRop.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/back/SsaToRop.java rename to core/src/main/java/external/com/android/dx/ssa/back/SsaToRop.java diff --git a/edxp-core/src/main/java/external/com/android/dx/ssa/package-info.java b/core/src/main/java/external/com/android/dx/ssa/package-info.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/ssa/package-info.java rename to core/src/main/java/external/com/android/dx/ssa/package-info.java diff --git a/edxp-core/src/main/java/external/com/android/dx/stock/ProxyBuilder.java b/core/src/main/java/external/com/android/dx/stock/ProxyBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/stock/ProxyBuilder.java rename to core/src/main/java/external/com/android/dx/stock/ProxyBuilder.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/AnnotatedOutput.java b/core/src/main/java/external/com/android/dx/util/AnnotatedOutput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/AnnotatedOutput.java rename to core/src/main/java/external/com/android/dx/util/AnnotatedOutput.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/BitIntSet.java b/core/src/main/java/external/com/android/dx/util/BitIntSet.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/BitIntSet.java rename to core/src/main/java/external/com/android/dx/util/BitIntSet.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/Bits.java b/core/src/main/java/external/com/android/dx/util/Bits.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/Bits.java rename to core/src/main/java/external/com/android/dx/util/Bits.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/ByteArray.java b/core/src/main/java/external/com/android/dx/util/ByteArray.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/ByteArray.java rename to core/src/main/java/external/com/android/dx/util/ByteArray.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/ByteArrayAnnotatedOutput.java b/core/src/main/java/external/com/android/dx/util/ByteArrayAnnotatedOutput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/ByteArrayAnnotatedOutput.java rename to core/src/main/java/external/com/android/dx/util/ByteArrayAnnotatedOutput.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/FixedSizeList.java b/core/src/main/java/external/com/android/dx/util/FixedSizeList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/FixedSizeList.java rename to core/src/main/java/external/com/android/dx/util/FixedSizeList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/Hex.java b/core/src/main/java/external/com/android/dx/util/Hex.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/Hex.java rename to core/src/main/java/external/com/android/dx/util/Hex.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/HexParser.java b/core/src/main/java/external/com/android/dx/util/HexParser.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/HexParser.java rename to core/src/main/java/external/com/android/dx/util/HexParser.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/IndentingWriter.java b/core/src/main/java/external/com/android/dx/util/IndentingWriter.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/IndentingWriter.java rename to core/src/main/java/external/com/android/dx/util/IndentingWriter.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/IntIterator.java b/core/src/main/java/external/com/android/dx/util/IntIterator.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/IntIterator.java rename to core/src/main/java/external/com/android/dx/util/IntIterator.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/IntList.java b/core/src/main/java/external/com/android/dx/util/IntList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/IntList.java rename to core/src/main/java/external/com/android/dx/util/IntList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/IntSet.java b/core/src/main/java/external/com/android/dx/util/IntSet.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/IntSet.java rename to core/src/main/java/external/com/android/dx/util/IntSet.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/LabeledItem.java b/core/src/main/java/external/com/android/dx/util/LabeledItem.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/LabeledItem.java rename to core/src/main/java/external/com/android/dx/util/LabeledItem.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/LabeledList.java b/core/src/main/java/external/com/android/dx/util/LabeledList.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/LabeledList.java rename to core/src/main/java/external/com/android/dx/util/LabeledList.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/ListIntSet.java b/core/src/main/java/external/com/android/dx/util/ListIntSet.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/ListIntSet.java rename to core/src/main/java/external/com/android/dx/util/ListIntSet.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/MutabilityControl.java b/core/src/main/java/external/com/android/dx/util/MutabilityControl.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/MutabilityControl.java rename to core/src/main/java/external/com/android/dx/util/MutabilityControl.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/MutabilityException.java b/core/src/main/java/external/com/android/dx/util/MutabilityException.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/MutabilityException.java rename to core/src/main/java/external/com/android/dx/util/MutabilityException.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/Output.java b/core/src/main/java/external/com/android/dx/util/Output.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/Output.java rename to core/src/main/java/external/com/android/dx/util/Output.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/ToHuman.java b/core/src/main/java/external/com/android/dx/util/ToHuman.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/ToHuman.java rename to core/src/main/java/external/com/android/dx/util/ToHuman.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/TwoColumnOutput.java b/core/src/main/java/external/com/android/dx/util/TwoColumnOutput.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/TwoColumnOutput.java rename to core/src/main/java/external/com/android/dx/util/TwoColumnOutput.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/Warning.java b/core/src/main/java/external/com/android/dx/util/Warning.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/Warning.java rename to core/src/main/java/external/com/android/dx/util/Warning.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/Writers.java b/core/src/main/java/external/com/android/dx/util/Writers.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/Writers.java rename to core/src/main/java/external/com/android/dx/util/Writers.java diff --git a/edxp-core/src/main/java/external/com/android/dx/util/package.html b/core/src/main/java/external/com/android/dx/util/package.html similarity index 100% rename from edxp-core/src/main/java/external/com/android/dx/util/package.html rename to core/src/main/java/external/com/android/dx/util/package.html diff --git a/edxp-core/src/main/java/external/com/android/multidex/ArchivePathElement.java b/core/src/main/java/external/com/android/multidex/ArchivePathElement.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/multidex/ArchivePathElement.java rename to core/src/main/java/external/com/android/multidex/ArchivePathElement.java diff --git a/edxp-core/src/main/java/external/com/android/multidex/ClassPathElement.java b/core/src/main/java/external/com/android/multidex/ClassPathElement.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/multidex/ClassPathElement.java rename to core/src/main/java/external/com/android/multidex/ClassPathElement.java diff --git a/edxp-core/src/main/java/external/com/android/multidex/ClassReferenceListBuilder.java b/core/src/main/java/external/com/android/multidex/ClassReferenceListBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/multidex/ClassReferenceListBuilder.java rename to core/src/main/java/external/com/android/multidex/ClassReferenceListBuilder.java diff --git a/edxp-core/src/main/java/external/com/android/multidex/FolderPathElement.java b/core/src/main/java/external/com/android/multidex/FolderPathElement.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/multidex/FolderPathElement.java rename to core/src/main/java/external/com/android/multidex/FolderPathElement.java diff --git a/edxp-core/src/main/java/external/com/android/multidex/MainDexListBuilder.java b/core/src/main/java/external/com/android/multidex/MainDexListBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/multidex/MainDexListBuilder.java rename to core/src/main/java/external/com/android/multidex/MainDexListBuilder.java diff --git a/edxp-core/src/main/java/external/com/android/multidex/Path.java b/core/src/main/java/external/com/android/multidex/Path.java similarity index 100% rename from edxp-core/src/main/java/external/com/android/multidex/Path.java rename to core/src/main/java/external/com/android/multidex/Path.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/ArrayUtils.java b/core/src/main/java/external/org/apache/commons/lang3/ArrayUtils.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/ArrayUtils.java rename to core/src/main/java/external/org/apache/commons/lang3/ArrayUtils.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/CharSequenceUtils.java b/core/src/main/java/external/org/apache/commons/lang3/CharSequenceUtils.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/CharSequenceUtils.java rename to core/src/main/java/external/org/apache/commons/lang3/CharSequenceUtils.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/CharUtils.java b/core/src/main/java/external/org/apache/commons/lang3/CharUtils.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/CharUtils.java rename to core/src/main/java/external/org/apache/commons/lang3/CharUtils.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/ClassUtils.java b/core/src/main/java/external/org/apache/commons/lang3/ClassUtils.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/ClassUtils.java rename to core/src/main/java/external/org/apache/commons/lang3/ClassUtils.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/JavaVersion.java b/core/src/main/java/external/org/apache/commons/lang3/JavaVersion.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/JavaVersion.java rename to core/src/main/java/external/org/apache/commons/lang3/JavaVersion.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/LICENSE.txt b/core/src/main/java/external/org/apache/commons/lang3/LICENSE.txt similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/LICENSE.txt rename to core/src/main/java/external/org/apache/commons/lang3/LICENSE.txt diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/MODIFICATIONS.txt b/core/src/main/java/external/org/apache/commons/lang3/MODIFICATIONS.txt similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/MODIFICATIONS.txt rename to core/src/main/java/external/org/apache/commons/lang3/MODIFICATIONS.txt diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/NOTICE.txt b/core/src/main/java/external/org/apache/commons/lang3/NOTICE.txt similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/NOTICE.txt rename to core/src/main/java/external/org/apache/commons/lang3/NOTICE.txt diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/ObjectUtils.java b/core/src/main/java/external/org/apache/commons/lang3/ObjectUtils.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/ObjectUtils.java rename to core/src/main/java/external/org/apache/commons/lang3/ObjectUtils.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/RELEASE-NOTES.txt b/core/src/main/java/external/org/apache/commons/lang3/RELEASE-NOTES.txt similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/RELEASE-NOTES.txt rename to core/src/main/java/external/org/apache/commons/lang3/RELEASE-NOTES.txt diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/StringUtils.java b/core/src/main/java/external/org/apache/commons/lang3/StringUtils.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/StringUtils.java rename to core/src/main/java/external/org/apache/commons/lang3/StringUtils.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/SystemUtils.java b/core/src/main/java/external/org/apache/commons/lang3/SystemUtils.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/SystemUtils.java rename to core/src/main/java/external/org/apache/commons/lang3/SystemUtils.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/Validate.java b/core/src/main/java/external/org/apache/commons/lang3/Validate.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/Validate.java rename to core/src/main/java/external/org/apache/commons/lang3/Validate.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/builder/Builder.java b/core/src/main/java/external/org/apache/commons/lang3/builder/Builder.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/builder/Builder.java rename to core/src/main/java/external/org/apache/commons/lang3/builder/Builder.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/builder/CompareToBuilder.java b/core/src/main/java/external/org/apache/commons/lang3/builder/CompareToBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/builder/CompareToBuilder.java rename to core/src/main/java/external/org/apache/commons/lang3/builder/CompareToBuilder.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/builder/EqualsBuilder.java b/core/src/main/java/external/org/apache/commons/lang3/builder/EqualsBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/builder/EqualsBuilder.java rename to core/src/main/java/external/org/apache/commons/lang3/builder/EqualsBuilder.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/builder/HashCodeBuilder.java b/core/src/main/java/external/org/apache/commons/lang3/builder/HashCodeBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/builder/HashCodeBuilder.java rename to core/src/main/java/external/org/apache/commons/lang3/builder/HashCodeBuilder.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/builder/IDKey.java b/core/src/main/java/external/org/apache/commons/lang3/builder/IDKey.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/builder/IDKey.java rename to core/src/main/java/external/org/apache/commons/lang3/builder/IDKey.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/core/src/main/java/external/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java rename to core/src/main/java/external/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/builder/ToStringBuilder.java b/core/src/main/java/external/org/apache/commons/lang3/builder/ToStringBuilder.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/builder/ToStringBuilder.java rename to core/src/main/java/external/org/apache/commons/lang3/builder/ToStringBuilder.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/builder/ToStringStyle.java b/core/src/main/java/external/org/apache/commons/lang3/builder/ToStringStyle.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/builder/ToStringStyle.java rename to core/src/main/java/external/org/apache/commons/lang3/builder/ToStringStyle.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/builder/package.html b/core/src/main/java/external/org/apache/commons/lang3/builder/package.html similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/builder/package.html rename to core/src/main/java/external/org/apache/commons/lang3/builder/package.html diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/exception/CloneFailedException.java b/core/src/main/java/external/org/apache/commons/lang3/exception/CloneFailedException.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/exception/CloneFailedException.java rename to core/src/main/java/external/org/apache/commons/lang3/exception/CloneFailedException.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/exception/package.html b/core/src/main/java/external/org/apache/commons/lang3/exception/package.html similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/exception/package.html rename to core/src/main/java/external/org/apache/commons/lang3/exception/package.html diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/mutable/Mutable.java b/core/src/main/java/external/org/apache/commons/lang3/mutable/Mutable.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/mutable/Mutable.java rename to core/src/main/java/external/org/apache/commons/lang3/mutable/Mutable.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/mutable/MutableInt.java b/core/src/main/java/external/org/apache/commons/lang3/mutable/MutableInt.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/mutable/MutableInt.java rename to core/src/main/java/external/org/apache/commons/lang3/mutable/MutableInt.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/mutable/package.html b/core/src/main/java/external/org/apache/commons/lang3/mutable/package.html similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/mutable/package.html rename to core/src/main/java/external/org/apache/commons/lang3/mutable/package.html diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/overview.html b/core/src/main/java/external/org/apache/commons/lang3/overview.html similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/overview.html rename to core/src/main/java/external/org/apache/commons/lang3/overview.html diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/package.html b/core/src/main/java/external/org/apache/commons/lang3/package.html similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/package.html rename to core/src/main/java/external/org/apache/commons/lang3/package.html diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/reflect/MemberUtils.java b/core/src/main/java/external/org/apache/commons/lang3/reflect/MemberUtils.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/reflect/MemberUtils.java rename to core/src/main/java/external/org/apache/commons/lang3/reflect/MemberUtils.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/reflect/MethodUtils.java b/core/src/main/java/external/org/apache/commons/lang3/reflect/MethodUtils.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/reflect/MethodUtils.java rename to core/src/main/java/external/org/apache/commons/lang3/reflect/MethodUtils.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/reflect/package.html b/core/src/main/java/external/org/apache/commons/lang3/reflect/package.html similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/reflect/package.html rename to core/src/main/java/external/org/apache/commons/lang3/reflect/package.html diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/tuple/ImmutablePair.java b/core/src/main/java/external/org/apache/commons/lang3/tuple/ImmutablePair.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/tuple/ImmutablePair.java rename to core/src/main/java/external/org/apache/commons/lang3/tuple/ImmutablePair.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/tuple/Pair.java b/core/src/main/java/external/org/apache/commons/lang3/tuple/Pair.java similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/tuple/Pair.java rename to core/src/main/java/external/org/apache/commons/lang3/tuple/Pair.java diff --git a/edxp-core/src/main/java/external/org/apache/commons/lang3/tuple/package.html b/core/src/main/java/external/org/apache/commons/lang3/tuple/package.html similarity index 100% rename from edxp-core/src/main/java/external/org/apache/commons/lang3/tuple/package.html rename to core/src/main/java/external/org/apache/commons/lang3/tuple/package.html diff --git a/core/src/main/java/io/github/lsposed/common/KeepAll.java b/core/src/main/java/io/github/lsposed/common/KeepAll.java new file mode 100644 index 00000000..3184c972 --- /dev/null +++ b/core/src/main/java/io/github/lsposed/common/KeepAll.java @@ -0,0 +1,4 @@ +package io.github.lsposed.common; + +public interface KeepAll { +} diff --git a/core/src/main/java/io/github/lsposed/common/KeepMembers.java b/core/src/main/java/io/github/lsposed/common/KeepMembers.java new file mode 100644 index 00000000..48f76b71 --- /dev/null +++ b/core/src/main/java/io/github/lsposed/common/KeepMembers.java @@ -0,0 +1,4 @@ +package io.github.lsposed.common; + +public interface KeepMembers { +} diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/HandleBindApp.java b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/HandleBindApp.java similarity index 96% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/HandleBindApp.java rename to core/src/main/java/io/github/lsposed/lspd/_hooker/impl/HandleBindApp.java index bc2d3fb4..8779e726 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/HandleBindApp.java +++ b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/HandleBindApp.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp._hooker.impl; +package io.github.lsposed.lspd._hooker.impl; import android.annotation.SuppressLint; import android.app.ActivityThread; @@ -10,10 +10,10 @@ import android.content.pm.ApplicationInfo; import android.content.res.CompatibilityInfo; import android.content.res.XResources; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.util.Hookers; -import com.elderdrivers.riru.edxp.util.MetaDataReader; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.util.Hookers; +import io.github.lsposed.lspd.util.MetaDataReader; +import io.github.lsposed.lspd.util.Utils; import java.io.File; import java.io.IOException; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/LoadedApkCstr.java b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/LoadedApkCstr.java similarity index 95% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/LoadedApkCstr.java rename to core/src/main/java/io/github/lsposed/lspd/_hooker/impl/LoadedApkCstr.java index 4ec4baf2..04014a96 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/LoadedApkCstr.java +++ b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/LoadedApkCstr.java @@ -1,11 +1,11 @@ -package com.elderdrivers.riru.edxp._hooker.impl; +package io.github.lsposed.lspd._hooker.impl; import android.app.AndroidAppHelper; import android.app.LoadedApk; import android.content.res.XResources; import android.util.Log; -import com.elderdrivers.riru.edxp.util.Hookers; +import io.github.lsposed.lspd.util.Hookers; import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedHelpers; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/LoadedApkGetCL.java b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/LoadedApkGetCL.java similarity index 91% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/LoadedApkGetCL.java rename to core/src/main/java/io/github/lsposed/lspd/_hooker/impl/LoadedApkGetCL.java index 4b09ef7d..7bd187b5 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/LoadedApkGetCL.java +++ b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/LoadedApkGetCL.java @@ -1,10 +1,10 @@ -package com.elderdrivers.riru.edxp._hooker.impl; +package io.github.lsposed.lspd._hooker.impl; import android.app.LoadedApk; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.hooker.XposedInstallerHooker; -import com.elderdrivers.riru.edxp.util.Hookers; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.hooker.XposedInstallerHooker; +import io.github.lsposed.lspd.util.Hookers; import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedBridge; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/StartBootstrapServices.java b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/StartBootstrapServices.java similarity index 93% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/StartBootstrapServices.java rename to core/src/main/java/io/github/lsposed/lspd/_hooker/impl/StartBootstrapServices.java index 0b1b11b1..c4a09f7b 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/StartBootstrapServices.java +++ b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/StartBootstrapServices.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.edxp._hooker.impl; +package io.github.lsposed.lspd._hooker.impl; import android.os.Build; -import com.elderdrivers.riru.edxp.util.Hookers; +import io.github.lsposed.lspd.util.Hookers; import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XC_MethodReplacement; @@ -11,7 +11,7 @@ import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.XposedInit; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import static com.elderdrivers.riru.edxp.util.Utils.logD; +import static io.github.lsposed.lspd.util.Utils.logD; import static de.robv.android.xposed.XposedHelpers.findAndHookMethod; public class StartBootstrapServices extends XC_MethodHook { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/SystemMain.java b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/SystemMain.java similarity index 82% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/SystemMain.java rename to core/src/main/java/io/github/lsposed/lspd/_hooker/impl/SystemMain.java index 2d0a3802..c4af5852 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/impl/SystemMain.java +++ b/core/src/main/java/io/github/lsposed/lspd/_hooker/impl/SystemMain.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.edxp._hooker.impl; +package io.github.lsposed.lspd._hooker.impl; -import com.elderdrivers.riru.edxp.core.Main; -import com.elderdrivers.riru.edxp.deopt.PrebuiltMethodsDeopter; -import com.elderdrivers.riru.edxp.util.Hookers; +import io.github.lsposed.lspd.core.Main; +import io.github.lsposed.lspd.deopt.PrebuiltMethodsDeopter; +import io.github.lsposed.lspd.util.Hookers; import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedBridge; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/art/ClassLinker.java b/core/src/main/java/io/github/lsposed/lspd/art/ClassLinker.java similarity index 81% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/art/ClassLinker.java rename to core/src/main/java/io/github/lsposed/lspd/art/ClassLinker.java index ef91cddf..b26e86e0 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/art/ClassLinker.java +++ b/core/src/main/java/io/github/lsposed/lspd/art/ClassLinker.java @@ -1,6 +1,6 @@ -package com.elderdrivers.riru.edxp.art; +package io.github.lsposed.lspd.art; -import com.elderdrivers.riru.common.KeepAll; +import io.github.lsposed.common.KeepAll; import java.lang.reflect.Member; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/art/Heap.java b/core/src/main/java/io/github/lsposed/lspd/art/Heap.java similarity index 65% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/art/Heap.java rename to core/src/main/java/io/github/lsposed/lspd/art/Heap.java index 31c40e28..fcfbfc06 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/art/Heap.java +++ b/core/src/main/java/io/github/lsposed/lspd/art/Heap.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.art; +package io.github.lsposed.lspd.art; public class Heap { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/BaseHookProvider.java b/core/src/main/java/io/github/lsposed/lspd/config/BaseHookProvider.java similarity index 83% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/BaseHookProvider.java rename to core/src/main/java/io/github/lsposed/lspd/config/BaseHookProvider.java index 636a4241..80337c22 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/BaseHookProvider.java +++ b/core/src/main/java/io/github/lsposed/lspd/config/BaseHookProvider.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.edxp.config; +package io.github.lsposed.lspd.config; -import com.elderdrivers.riru.edxp.core.Yahfa; -import com.elderdrivers.riru.edxp.deopt.PrebuiltMethodsDeopter; -import com.elderdrivers.riru.edxp.hook.HookProvider; +import io.github.lsposed.lspd.core.Yahfa; +import io.github.lsposed.lspd.deopt.PrebuiltMethodsDeopter; +import io.github.lsposed.lspd.hook.HookProvider; import java.lang.reflect.Member; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/ConfigManager.java b/core/src/main/java/io/github/lsposed/lspd/config/ConfigManager.java similarity index 94% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/ConfigManager.java rename to core/src/main/java/io/github/lsposed/lspd/config/ConfigManager.java index 9feb4f16..f08775c6 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/ConfigManager.java +++ b/core/src/main/java/io/github/lsposed/lspd/config/ConfigManager.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.config; +package io.github.lsposed.lspd.config; public class ConfigManager { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/EdXpConfigGlobal.java b/core/src/main/java/io/github/lsposed/lspd/config/LSPdConfigGlobal.java similarity index 68% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/EdXpConfigGlobal.java rename to core/src/main/java/io/github/lsposed/lspd/config/LSPdConfigGlobal.java index 8a4f1dd7..c39cca0a 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/config/EdXpConfigGlobal.java +++ b/core/src/main/java/io/github/lsposed/lspd/config/LSPdConfigGlobal.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.edxp.config; +package io.github.lsposed.lspd.config; -import com.elderdrivers.riru.edxp.hook.HookProvider; +import io.github.lsposed.lspd.hook.HookProvider; -public class EdXpConfigGlobal { +public class LSPdConfigGlobal { public static volatile HookProvider sHookProvider; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java b/core/src/main/java/io/github/lsposed/lspd/core/BaseEdxpImpl.java similarity index 85% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java rename to core/src/main/java/io/github/lsposed/lspd/core/BaseEdxpImpl.java index 4d97cad8..ec4e0eb7 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java +++ b/core/src/main/java/io/github/lsposed/lspd/core/BaseEdxpImpl.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.edxp.core; +package io.github.lsposed.lspd.core; import androidx.annotation.NonNull; -import com.elderdrivers.riru.edxp.proxy.NormalProxy; -import com.elderdrivers.riru.edxp.proxy.Router; +import io.github.lsposed.lspd.proxy.NormalProxy; +import io.github.lsposed.lspd.proxy.Router; public abstract class BaseEdxpImpl implements EdxpImpl { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java b/core/src/main/java/io/github/lsposed/lspd/core/EdxpImpl.java similarity index 80% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java rename to core/src/main/java/io/github/lsposed/lspd/core/EdxpImpl.java index acaa4144..14532b05 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java +++ b/core/src/main/java/io/github/lsposed/lspd/core/EdxpImpl.java @@ -1,10 +1,10 @@ -package com.elderdrivers.riru.edxp.core; +package io.github.lsposed.lspd.core; import androidx.annotation.IntDef; import androidx.annotation.NonNull; -import com.elderdrivers.riru.common.KeepAll; -import com.elderdrivers.riru.edxp.proxy.Router; +import io.github.lsposed.common.KeepAll; +import io.github.lsposed.lspd.proxy.Router; import java.lang.annotation.Retention; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/Main.java b/core/src/main/java/io/github/lsposed/lspd/core/Main.java similarity index 69% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/Main.java rename to core/src/main/java/io/github/lsposed/lspd/core/Main.java index d454075d..4980e638 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/Main.java +++ b/core/src/main/java/io/github/lsposed/lspd/core/Main.java @@ -1,15 +1,15 @@ -package com.elderdrivers.riru.edxp.core; +package io.github.lsposed.lspd.core; import android.annotation.SuppressLint; -import com.elderdrivers.riru.common.KeepAll; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.common.KeepAll; +import io.github.lsposed.lspd.util.Utils; import java.util.concurrent.atomic.AtomicReference; @SuppressLint("DefaultLocale") public class Main implements KeepAll { - private static final AtomicReference edxpImplRef = new AtomicReference<>(null); + private static final AtomicReference lspdImplRef = new AtomicReference<>(null); /////////////////////////////////////////////////////////////////////////////////////////////// // entry points @@ -24,13 +24,13 @@ public class Main implements KeepAll { } public static void forkAndSpecializePost(int pid, String appDataDir, String niceName, int variant) { - EdxpImpl edxp = getEdxpImpl(variant); - if (edxp == null || !edxp.isInitialized()) { + EdxpImpl lspd = getEdxpImpl(variant); + if (lspd == null || !lspd.isInitialized()) { Utils.logE("Not started up"); return; } if (pid == 0) { - edxp.getNormalProxy().forkAndSpecializePost(pid, appDataDir, niceName); + lspd.getNormalProxy().forkAndSpecializePost(pid, appDataDir, niceName); } } @@ -40,32 +40,32 @@ public class Main implements KeepAll { } public static void forkSystemServerPost(int pid, int variant) { - EdxpImpl edxp = getEdxpImpl(variant); - if (edxp == null || !edxp.isInitialized()) { + EdxpImpl lspd = getEdxpImpl(variant); + if (lspd == null || !lspd.isInitialized()) { return; } if (pid == 0) { - edxp.getNormalProxy().forkSystemServerPost(pid); + lspd.getNormalProxy().forkSystemServerPost(pid); } } - public static synchronized boolean setEdxpImpl(EdxpImpl edxp) { - return edxpImplRef.compareAndSet(null, edxp); + public static synchronized boolean setEdxpImpl(EdxpImpl lspd) { + return lspdImplRef.compareAndSet(null, lspd); } public static synchronized EdxpImpl getEdxpImpl(int variant) { - EdxpImpl edxp = edxpImplRef.get(); - if (edxp != null) { - return edxp; + EdxpImpl lspd = lspdImplRef.get(); + if (lspd != null) { + return lspd; } Utils.logD("Loading variant " + variant); try { switch (variant) { case EdxpImpl.YAHFA: - Class.forName("com.elderdrivers.riru.edxp.yahfa.core.YahfaEdxpImpl"); + Class.forName("io.github.lsposed.lspd.yahfa.core.YahfaEdxpImpl"); break; case EdxpImpl.SANDHOOK: - Class.forName("com.elderdrivers.riru.edxp.sandhook.core.SandHookEdxpImpl"); + Class.forName("io.github.lsposed.lspd.sandhook.core.SandHookEdxpImpl"); break; default: Utils.logE("Unsupported variant " + variant); @@ -74,11 +74,11 @@ public class Main implements KeepAll { } catch (ClassNotFoundException e) { Utils.logE("loadEdxpImpls: Class not found", e); } - return edxpImplRef.get(); + return lspdImplRef.get(); } public static synchronized EdxpImpl getEdxpImpl() { - return edxpImplRef.get(); + return lspdImplRef.get(); } @EdxpImpl.Variant diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/Proxy.java b/core/src/main/java/io/github/lsposed/lspd/core/Proxy.java similarity index 89% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/Proxy.java rename to core/src/main/java/io/github/lsposed/lspd/core/Proxy.java index c0518a3b..f424f0e2 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/Proxy.java +++ b/core/src/main/java/io/github/lsposed/lspd/core/Proxy.java @@ -1,6 +1,6 @@ -package com.elderdrivers.riru.edxp.core; +package io.github.lsposed.lspd.core; -import com.elderdrivers.riru.common.KeepAll; +import io.github.lsposed.common.KeepAll; public interface Proxy extends KeepAll { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/ResourcesHook.java b/core/src/main/java/io/github/lsposed/lspd/core/ResourcesHook.java similarity index 79% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/ResourcesHook.java rename to core/src/main/java/io/github/lsposed/lspd/core/ResourcesHook.java index 684a426b..8a11312b 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/ResourcesHook.java +++ b/core/src/main/java/io/github/lsposed/lspd/core/ResourcesHook.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.core; +package io.github.lsposed.lspd.core; public class ResourcesHook { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/Yahfa.java b/core/src/main/java/io/github/lsposed/lspd/core/Yahfa.java similarity index 92% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/Yahfa.java rename to core/src/main/java/io/github/lsposed/lspd/core/Yahfa.java index e48dfd2a..02b5758b 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/Yahfa.java +++ b/core/src/main/java/io/github/lsposed/lspd/core/Yahfa.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.core; +package io.github.lsposed.lspd.core; import java.lang.reflect.Member; import java.lang.reflect.Method; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/yahfa/HookMain.java b/core/src/main/java/io/github/lsposed/lspd/core/yahfa/HookMain.java similarity index 95% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/yahfa/HookMain.java rename to core/src/main/java/io/github/lsposed/lspd/core/yahfa/HookMain.java index fad8b299..afaf4ce5 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/core/yahfa/HookMain.java +++ b/core/src/main/java/io/github/lsposed/lspd/core/yahfa/HookMain.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.edxp.core.yahfa; +package io.github.lsposed.lspd.core.yahfa; -import com.elderdrivers.riru.edxp.art.Heap; -import com.elderdrivers.riru.edxp.core.Yahfa; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.art.Heap; +import io.github.lsposed.lspd.core.Yahfa; +import io.github.lsposed.lspd.util.Utils; import java.lang.reflect.Constructor; import java.lang.reflect.Member; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/deopt/InlinedMethodCallers.java b/core/src/main/java/io/github/lsposed/lspd/deopt/InlinedMethodCallers.java similarity index 98% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/deopt/InlinedMethodCallers.java rename to core/src/main/java/io/github/lsposed/lspd/deopt/InlinedMethodCallers.java index 093942f6..c557ee97 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/deopt/InlinedMethodCallers.java +++ b/core/src/main/java/io/github/lsposed/lspd/deopt/InlinedMethodCallers.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.deopt; +package io.github.lsposed.lspd.deopt; import java.util.HashMap; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/deopt/PrebuiltMethodsDeopter.java b/core/src/main/java/io/github/lsposed/lspd/deopt/PrebuiltMethodsDeopter.java similarity index 70% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/deopt/PrebuiltMethodsDeopter.java rename to core/src/main/java/io/github/lsposed/lspd/deopt/PrebuiltMethodsDeopter.java index 92bcf107..037dd42f 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/deopt/PrebuiltMethodsDeopter.java +++ b/core/src/main/java/io/github/lsposed/lspd/deopt/PrebuiltMethodsDeopter.java @@ -1,18 +1,18 @@ -package com.elderdrivers.riru.edxp.deopt; +package io.github.lsposed.lspd.deopt; import android.text.TextUtils; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.config.EdXpConfigGlobal; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.config.LSPdConfigGlobal; +import io.github.lsposed.lspd.util.Utils; import java.util.Arrays; import de.robv.android.xposed.XposedHelpers; -import static com.elderdrivers.riru.edxp.deopt.InlinedMethodCallers.KEY_BOOT_IMAGE; -import static com.elderdrivers.riru.edxp.deopt.InlinedMethodCallers.KEY_BOOT_IMAGE_MIUI_RES; -import static com.elderdrivers.riru.edxp.deopt.InlinedMethodCallers.KEY_SYSTEM_SERVER; +import static io.github.lsposed.lspd.deopt.InlinedMethodCallers.KEY_BOOT_IMAGE; +import static io.github.lsposed.lspd.deopt.InlinedMethodCallers.KEY_BOOT_IMAGE_MIUI_RES; +import static io.github.lsposed.lspd.deopt.InlinedMethodCallers.KEY_SYSTEM_SERVER; public class PrebuiltMethodsDeopter { @@ -27,10 +27,10 @@ public class PrebuiltMethodsDeopter { if (clazz == null) { continue; } - Object method = EdXpConfigGlobal.getHookProvider().findMethodNative( + Object method = LSPdConfigGlobal.getHookProvider().findMethodNative( clazz, caller[1], caller[2]); if (method != null) { - EdXpConfigGlobal.getHookProvider().deoptMethodNative(method); + LSPdConfigGlobal.getHookProvider().deoptMethodNative(method); } } catch (Throwable throwable) { Utils.logE("error when deopting method: " + Arrays.toString(caller), throwable); diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/framework/Zygote.java b/core/src/main/java/io/github/lsposed/lspd/framework/Zygote.java similarity index 86% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/framework/Zygote.java rename to core/src/main/java/io/github/lsposed/lspd/framework/Zygote.java index f59cc562..d3e13b25 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/framework/Zygote.java +++ b/core/src/main/java/io/github/lsposed/lspd/framework/Zygote.java @@ -1,6 +1,6 @@ -package com.elderdrivers.riru.edxp.framework; +package io.github.lsposed.lspd.framework; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.util.Utils; import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.annotation.ApiSensitive; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/hook/HookProvider.java b/core/src/main/java/io/github/lsposed/lspd/hook/HookProvider.java similarity index 94% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/hook/HookProvider.java rename to core/src/main/java/io/github/lsposed/lspd/hook/HookProvider.java index 929a9de8..6de3c3e8 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/hook/HookProvider.java +++ b/core/src/main/java/io/github/lsposed/lspd/hook/HookProvider.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.hook; +package io.github.lsposed.lspd.hook; import java.lang.reflect.Member; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/hooker/XposedInstallerHooker.java b/core/src/main/java/io/github/lsposed/lspd/hooker/XposedInstallerHooker.java similarity index 72% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/hooker/XposedInstallerHooker.java rename to core/src/main/java/io/github/lsposed/lspd/hooker/XposedInstallerHooker.java index f119dbe3..2ac5312d 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/hooker/XposedInstallerHooker.java +++ b/core/src/main/java/io/github/lsposed/lspd/hooker/XposedInstallerHooker.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.hooker; +package io.github.lsposed.lspd.hooker; import android.app.AndroidAppHelper; import android.content.Context; @@ -8,12 +8,12 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.elderdrivers.riru.edxp.BuildConfig; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.config.EdXpConfigGlobal; -import com.elderdrivers.riru.edxp.core.EdxpImpl; -import com.elderdrivers.riru.edxp.core.Main; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.BuildConfig; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.config.LSPdConfigGlobal; +import io.github.lsposed.lspd.core.EdxpImpl; +import io.github.lsposed.lspd.core.Main; +import io.github.lsposed.lspd.util.Utils; import java.io.ByteArrayInputStream; import java.io.File; @@ -42,51 +42,51 @@ public class XposedInstallerHooker { } final String variant = variant_; - // EdXposed Manager R + // LSPosed Manager R try { - XposedHelpers.findAndHookMethod("org.meowcat.edxposed.manager.Constants", classLoader, "getXposedApiVersion", new XC_MethodReplacement() { + XposedHelpers.findAndHookMethod("io.github.lsposed.manager.Constants", classLoader, "getXposedApiVersion", new XC_MethodReplacement() { @Override protected Object replaceHookedMethod(MethodHookParam param) { return XposedBridge.getXposedVersion(); } }); - XposedHelpers.findAndHookMethod("org.meowcat.edxposed.manager.Constants", classLoader, "getXposedVersion", new XC_MethodReplacement() { + XposedHelpers.findAndHookMethod("io.github.lsposed.manager.Constants", classLoader, "getXposedVersion", new XC_MethodReplacement() { @Override protected Object replaceHookedMethod(MethodHookParam param) { return BuildConfig.VERSION_NAME; } }); - XposedHelpers.findAndHookMethod("org.meowcat.edxposed.manager.Constants", classLoader, "getXposedVersionCode", new XC_MethodReplacement() { + XposedHelpers.findAndHookMethod("io.github.lsposed.manager.Constants", classLoader, "getXposedVersionCode", new XC_MethodReplacement() { @Override protected Object replaceHookedMethod(MethodHookParam param) { return BuildConfig.VERSION_CODE; } }); - XposedHelpers.findAndHookMethod("org.meowcat.edxposed.manager.Constants", classLoader, "getXposedApiVersion", new XC_MethodReplacement() { + XposedHelpers.findAndHookMethod("io.github.lsposed.manager.Constants", classLoader, "getXposedApiVersion", new XC_MethodReplacement() { @Override protected Object replaceHookedMethod(MethodHookParam param) { return XposedBridge.getXposedVersion(); } }); - XposedHelpers.findAndHookMethod("org.meowcat.edxposed.manager.Constants", classLoader, "getXposedVariant", new XC_MethodReplacement() { + XposedHelpers.findAndHookMethod("io.github.lsposed.manager.Constants", classLoader, "getXposedVariant", new XC_MethodReplacement() { @Override protected Object replaceHookedMethod(MethodHookParam param) { return variant; } }); - XposedHelpers.findAndHookMethod("org.meowcat.edxposed.manager.Constants", classLoader, "getBaseDir", new XC_MethodReplacement() { + XposedHelpers.findAndHookMethod("io.github.lsposed.manager.Constants", classLoader, "getBaseDir", new XC_MethodReplacement() { @Override protected Object replaceHookedMethod(MethodHookParam param) { return ConfigManager.getBaseConfigPath() + "/"; } }); - Utils.logD("Hooked EdXposed Manager R"); + Utils.logD("Hooked LSPosed Manager R"); return; } catch (Throwable t) { - Utils.logW("Could not hook EdXposed Manager R", t); + Utils.logW("Could not hook LSPosed Manager R", t); } - // EdXposed Manager and Xposed Installer + // LSPosed Manager and Xposed Installer try { final String xposedAppClass = "de.robv.android.xposed.installer.XposedApp"; final Class InstallZipUtil = XposedHelpers.findClass("de.robv.android.xposed.installer.util.InstallZipUtil", classLoader); @@ -132,24 +132,24 @@ public class XposedInstallerHooker { } }); } catch (Throwable t) { - Utils.logW("Could not hook Xposed Installer or EdXposed Manager", t); + Utils.logW("Could not hook Xposed Installer or LSPosed Manager", t); return; } - // EdXposed Manager - deoptMethod(classLoader, "org.meowcat.edxposed.manager.ModulesFragment", "onActivityCreated", Bundle.class); - deoptMethod(classLoader, "org.meowcat.edxposed.manager.ModulesFragment", "showMenu", Context.class, View.class, ApplicationInfo.class); - deoptMethod(classLoader, "org.meowcat.edxposed.manager.StatusInstallerFragment", "onCreateView", LayoutInflater.class, ViewGroup.class, Bundle.class); - deoptMethod(classLoader, "org.meowcat.edxposed.manager.util.ModuleUtil", "updateModulesList", boolean.class, View.class); + // LSPosed Manager + deoptMethod(classLoader, "io.github.lsposed.manager.ModulesFragment", "onActivityCreated", Bundle.class); + deoptMethod(classLoader, "io.github.lsposed.manager.ModulesFragment", "showMenu", Context.class, View.class, ApplicationInfo.class); + deoptMethod(classLoader, "io.github.lsposed.manager.StatusInstallerFragment", "onCreateView", LayoutInflater.class, ViewGroup.class, Bundle.class); + deoptMethod(classLoader, "io.github.lsposed.manager.util.ModuleUtil", "updateModulesList", boolean.class, View.class); try { - XposedHelpers.findAndHookMethod("org.meowcat.edxposed.manager.XposedApp", classLoader, "onCreate", new XC_MethodHook() { + XposedHelpers.findAndHookMethod("io.github.lsposed.manager.XposedApp", classLoader, "onCreate", new XC_MethodHook() { @Override protected void afterHookedMethod(MethodHookParam param) throws Throwable { XposedHelpers.setStaticObjectField(param.thisObject.getClass(), "BASE_DIR", ConfigManager.getBaseConfigPath() + "/"); XposedHelpers.setStaticObjectField(param.thisObject.getClass(), "ENABLED_MODULES_LIST_FILE", ConfigManager.getConfigPath("enabled_modules.list")); } }); - XposedHelpers.findAndHookMethod("org.meowcat.edxposed.manager.util.ModuleUtil", classLoader, "updateModulesList", boolean.class, View.class, new XC_MethodHook() { + XposedHelpers.findAndHookMethod("io.github.lsposed.manager.util.ModuleUtil", classLoader, "updateModulesList", boolean.class, View.class, new XC_MethodHook() { @Override protected void beforeHookedMethod(MethodHookParam param) throws Throwable { final Object thisObject = param.thisObject; @@ -159,7 +159,7 @@ public class XposedInstallerHooker { } }); - XposedHelpers.findAndHookMethod("org.meowcat.edxposed.manager.StatusInstallerFragment", classLoader, "getCanonicalFile", File.class, new XC_MethodHook() { + XposedHelpers.findAndHookMethod("io.github.lsposed.manager.StatusInstallerFragment", classLoader, "getCanonicalFile", File.class, new XC_MethodHook() { @Override protected void beforeHookedMethod(MethodHookParam param) throws Throwable { File arg = (File) param.args[0]; @@ -168,7 +168,7 @@ public class XposedInstallerHooker { } } }); - Utils.logD("Hooked EdXposed Manager"); + Utils.logD("Hooked LSPosed Manager"); } catch (Throwable t) { Utils.logD("Hooked Xposed Installer"); } @@ -178,12 +178,12 @@ public class XposedInstallerHooker { try { Class clazz = XposedHelpers.findClassIfExists(className, cl); if (clazz == null) { - Utils.logE("Class " + className + " not found when deoptimizing EdXposed Manager"); + Utils.logE("Class " + className + " not found when deoptimizing LSPosed Manager"); return; } Object method = XposedHelpers.findMethodExact(clazz, methodName, params); - EdXpConfigGlobal.getHookProvider().deoptMethodNative(method); + LSPdConfigGlobal.getHookProvider().deoptMethodNative(method); } catch (Throwable t) { Utils.logE("Error when deoptimizing " + className + ":" + methodName, t); } diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseProxy.java b/core/src/main/java/io/github/lsposed/lspd/proxy/BaseProxy.java similarity index 80% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseProxy.java rename to core/src/main/java/io/github/lsposed/lspd/proxy/BaseProxy.java index c42897ab..168d2749 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseProxy.java +++ b/core/src/main/java/io/github/lsposed/lspd/proxy/BaseProxy.java @@ -1,6 +1,6 @@ -package com.elderdrivers.riru.edxp.proxy; +package io.github.lsposed.lspd.proxy; -import com.elderdrivers.riru.edxp.core.Proxy; +import io.github.lsposed.lspd.core.Proxy; import de.robv.android.xposed.XposedBridge; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseRouter.java b/core/src/main/java/io/github/lsposed/lspd/proxy/BaseRouter.java similarity index 89% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseRouter.java rename to core/src/main/java/io/github/lsposed/lspd/proxy/BaseRouter.java index ca72cd87..70c44f5d 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseRouter.java +++ b/core/src/main/java/io/github/lsposed/lspd/proxy/BaseRouter.java @@ -1,16 +1,16 @@ -package com.elderdrivers.riru.edxp.proxy; +package io.github.lsposed.lspd.proxy; import android.app.ActivityThread; import android.content.pm.ApplicationInfo; import android.content.res.CompatibilityInfo; import android.text.TextUtils; -import com.elderdrivers.riru.edxp._hooker.impl.HandleBindApp; -import com.elderdrivers.riru.edxp._hooker.impl.LoadedApkCstr; -import com.elderdrivers.riru.edxp._hooker.impl.StartBootstrapServices; -import com.elderdrivers.riru.edxp._hooker.impl.SystemMain; -import com.elderdrivers.riru.edxp.util.Utils; -import com.elderdrivers.riru.edxp.util.Versions; +import io.github.lsposed.lspd._hooker.impl.HandleBindApp; +import io.github.lsposed.lspd._hooker.impl.LoadedApkCstr; +import io.github.lsposed.lspd._hooker.impl.StartBootstrapServices; +import io.github.lsposed.lspd._hooker.impl.SystemMain; +import io.github.lsposed.lspd.util.Utils; +import io.github.lsposed.lspd.util.Versions; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/NormalProxy.java b/core/src/main/java/io/github/lsposed/lspd/proxy/NormalProxy.java similarity index 86% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/NormalProxy.java rename to core/src/main/java/io/github/lsposed/lspd/proxy/NormalProxy.java index ab1d3771..4b2d6909 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/NormalProxy.java +++ b/core/src/main/java/io/github/lsposed/lspd/proxy/NormalProxy.java @@ -1,13 +1,13 @@ -package com.elderdrivers.riru.edxp.proxy; +package io.github.lsposed.lspd.proxy; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.deopt.PrebuiltMethodsDeopter; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.deopt.PrebuiltMethodsDeopter; +import io.github.lsposed.lspd.util.Utils; import de.robv.android.xposed.SELinuxHelper; import de.robv.android.xposed.XposedInit; -import static com.elderdrivers.riru.edxp.util.FileUtils.getDataPathPrefix; +import static io.github.lsposed.lspd.util.FileUtils.getDataPathPrefix; public class NormalProxy extends BaseProxy { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/Router.java b/core/src/main/java/io/github/lsposed/lspd/proxy/Router.java similarity index 90% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/Router.java rename to core/src/main/java/io/github/lsposed/lspd/proxy/Router.java index 63fcd31f..f50dc671 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/Router.java +++ b/core/src/main/java/io/github/lsposed/lspd/proxy/Router.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.proxy; +package io.github.lsposed.lspd.proxy; public interface Router { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/config/SandHookProvider.java similarity index 88% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/config/SandHookProvider.java index 318fac6f..f0bec4bc 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/config/SandHookProvider.java @@ -1,11 +1,11 @@ -package com.elderdrivers.riru.edxp.sandhook.config; +package io.github.lsposed.lspd.sandhook.config; import android.util.Log; -import com.elderdrivers.riru.edxp.art.ClassLinker; -import com.elderdrivers.riru.edxp.config.BaseHookProvider; -import com.elderdrivers.riru.edxp.core.ResourcesHook; -import com.elderdrivers.riru.edxp.core.Yahfa; +import io.github.lsposed.lspd.art.ClassLinker; +import io.github.lsposed.lspd.config.BaseHookProvider; +import io.github.lsposed.lspd.core.ResourcesHook; +import io.github.lsposed.lspd.core.Yahfa; import com.swift.sandhook.xposedcompat.XposedCompat; import com.swift.sandhook.xposedcompat.methodgen.SandHookXposedBridge; @@ -16,7 +16,7 @@ import java.lang.reflect.Method; import de.robv.android.xposed.XposedBridge; -import static com.elderdrivers.riru.edxp.util.ClassUtils.shouldDelayHook; +import static io.github.lsposed.lspd.util.ClassUtils.shouldDelayHook; public class SandHookProvider extends BaseHookProvider { @Override diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/SandHookEdxpImpl.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/core/SandHookEdxpImpl.java similarity index 53% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/SandHookEdxpImpl.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/core/SandHookEdxpImpl.java index 1f578656..59a51684 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/SandHookEdxpImpl.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/core/SandHookEdxpImpl.java @@ -1,24 +1,24 @@ -package com.elderdrivers.riru.edxp.sandhook.core; +package io.github.lsposed.lspd.sandhook.core; import android.os.Build; -import com.elderdrivers.riru.edxp.core.BaseEdxpImpl; -import com.elderdrivers.riru.edxp.core.EdxpImpl; -import com.elderdrivers.riru.edxp.core.Main; -import com.elderdrivers.riru.edxp.core.Yahfa; +import io.github.lsposed.lspd.core.BaseEdxpImpl; +import io.github.lsposed.lspd.core.EdxpImpl; +import io.github.lsposed.lspd.core.Main; +import io.github.lsposed.lspd.core.Yahfa; import com.swift.sandhook.xposedcompat.methodgen.SandHookXposedBridge; public class SandHookEdxpImpl extends BaseEdxpImpl { static { - final EdxpImpl edxpImpl = new SandHookEdxpImpl(); - if (Main.setEdxpImpl(edxpImpl)) { - edxpImpl.init(); + final EdxpImpl lspdImpl = new SandHookEdxpImpl(); + if (Main.setEdxpImpl(lspdImpl)) { + lspdImpl.init(); } } @Override - protected com.elderdrivers.riru.edxp.proxy.Router createRouter() { + protected io.github.lsposed.lspd.proxy.Router createRouter() { return new SandHookRouter(); } diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/SandHookRouter.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/core/SandHookRouter.java similarity index 68% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/SandHookRouter.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/core/SandHookRouter.java index a44749c1..e5095434 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/core/SandHookRouter.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/core/SandHookRouter.java @@ -1,13 +1,13 @@ -package com.elderdrivers.riru.edxp.sandhook.core; +package io.github.lsposed.lspd.sandhook.core; -import com.elderdrivers.riru.edxp.config.EdXpConfigGlobal; -import com.elderdrivers.riru.edxp.proxy.BaseRouter; -import com.elderdrivers.riru.edxp.sandhook.config.SandHookProvider; -import com.elderdrivers.riru.edxp.sandhook.entry.AppBootstrapHookInfo; -import com.elderdrivers.riru.edxp.sandhook.entry.SysBootstrapHookInfo; -import com.elderdrivers.riru.edxp.sandhook.entry.SysInnerHookInfo; -import com.elderdrivers.riru.edxp.sandhook.hooker.SystemMainHooker; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.config.LSPdConfigGlobal; +import io.github.lsposed.lspd.proxy.BaseRouter; +import io.github.lsposed.lspd.sandhook.config.SandHookProvider; +import io.github.lsposed.lspd.sandhook.entry.AppBootstrapHookInfo; +import io.github.lsposed.lspd.sandhook.entry.SysBootstrapHookInfo; +import io.github.lsposed.lspd.sandhook.entry.SysInnerHookInfo; +import io.github.lsposed.lspd.sandhook.hooker.SystemMainHooker; +import io.github.lsposed.lspd.util.Utils; import com.swift.sandhook.xposedcompat.XposedCompat; import com.swift.sandhook.xposedcompat.methodgen.SandHookXposedBridge; @@ -49,7 +49,7 @@ public class SandHookRouter extends BaseRouter { } public void injectConfig() { - EdXpConfigGlobal.sHookProvider = new SandHookProvider(); + LSPdConfigGlobal.sHookProvider = new SandHookProvider(); } } diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/AppBootstrapHookInfo.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/entry/AppBootstrapHookInfo.java similarity index 58% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/AppBootstrapHookInfo.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/entry/AppBootstrapHookInfo.java index c976a6c2..6975438a 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/AppBootstrapHookInfo.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/entry/AppBootstrapHookInfo.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.edxp.sandhook.entry; +package io.github.lsposed.lspd.sandhook.entry; -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.sandhook.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.edxp.sandhook.hooker.LoadedApkConstructorHooker; +import io.github.lsposed.common.KeepMembers; +import io.github.lsposed.lspd.sandhook.hooker.HandleBindAppHooker; +import io.github.lsposed.lspd.sandhook.hooker.LoadedApkConstructorHooker; public class AppBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/SysBootstrapHookInfo.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/entry/SysBootstrapHookInfo.java similarity index 57% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/SysBootstrapHookInfo.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/entry/SysBootstrapHookInfo.java index 25e9d9fc..7ef992ef 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/SysBootstrapHookInfo.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/entry/SysBootstrapHookInfo.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.edxp.sandhook.entry; +package io.github.lsposed.lspd.sandhook.entry; -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.sandhook.hooker.HandleBindAppHooker; -import com.elderdrivers.riru.edxp.sandhook.hooker.LoadedApkConstructorHooker; -import com.elderdrivers.riru.edxp.sandhook.hooker.SystemMainHooker; +import io.github.lsposed.common.KeepMembers; +import io.github.lsposed.lspd.sandhook.hooker.HandleBindAppHooker; +import io.github.lsposed.lspd.sandhook.hooker.LoadedApkConstructorHooker; +import io.github.lsposed.lspd.sandhook.hooker.SystemMainHooker; public class SysBootstrapHookInfo implements KeepMembers { public static String[] hookItemNames = { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/SysInnerHookInfo.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/entry/SysInnerHookInfo.java similarity index 58% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/SysInnerHookInfo.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/entry/SysInnerHookInfo.java index c5df312c..a1b3434a 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/entry/SysInnerHookInfo.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/entry/SysInnerHookInfo.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.edxp.sandhook.entry; +package io.github.lsposed.lspd.sandhook.entry; -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp.sandhook.hooker.StartBootstrapServicesHooker; -import com.elderdrivers.riru.edxp.sandhook.hooker.StartBootstrapServicesHooker11; -import com.elderdrivers.riru.edxp.util.Versions; +import io.github.lsposed.common.KeepMembers; +import io.github.lsposed.lspd.sandhook.hooker.StartBootstrapServicesHooker; +import io.github.lsposed.lspd.sandhook.hooker.StartBootstrapServicesHooker11; +import io.github.lsposed.lspd.util.Versions; public class SysInnerHookInfo implements KeepMembers { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/HandleBindAppHooker.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/HandleBindAppHooker.java similarity index 91% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/HandleBindAppHooker.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/HandleBindAppHooker.java index 496b2bc2..3988e20b 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/HandleBindAppHooker.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/HandleBindAppHooker.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.edxp.sandhook.hooker; +package io.github.lsposed.lspd.sandhook.hooker; import android.app.ActivityThread; -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.HandleBindApp; +import io.github.lsposed.common.KeepMembers; +import io.github.lsposed.lspd._hooker.impl.HandleBindApp; import com.swift.sandhook.SandHook; import com.swift.sandhook.annotation.HookClass; import com.swift.sandhook.annotation.HookMethod; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/LoadedApkConstructorHooker.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/LoadedApkConstructorHooker.java similarity index 94% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/LoadedApkConstructorHooker.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/LoadedApkConstructorHooker.java index efa05afb..fa0f0698 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/LoadedApkConstructorHooker.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/LoadedApkConstructorHooker.java @@ -1,12 +1,12 @@ -package com.elderdrivers.riru.edxp.sandhook.hooker; +package io.github.lsposed.lspd.sandhook.hooker; import android.app.ActivityThread; import android.app.LoadedApk; import android.content.pm.ApplicationInfo; import android.content.res.CompatibilityInfo; -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.LoadedApkCstr; +import io.github.lsposed.common.KeepMembers; +import io.github.lsposed.lspd._hooker.impl.LoadedApkCstr; import com.swift.sandhook.SandHook; import com.swift.sandhook.annotation.HookClass; import com.swift.sandhook.annotation.HookMethod; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/StartBootstrapServicesHooker.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/StartBootstrapServicesHooker.java similarity index 89% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/StartBootstrapServicesHooker.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/StartBootstrapServicesHooker.java index d432d32e..13186a2d 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/StartBootstrapServicesHooker.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/StartBootstrapServicesHooker.java @@ -1,7 +1,7 @@ -package com.elderdrivers.riru.edxp.sandhook.hooker; +package io.github.lsposed.lspd.sandhook.hooker; -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.StartBootstrapServices; +import io.github.lsposed.common.KeepMembers; +import io.github.lsposed.lspd._hooker.impl.StartBootstrapServices; import com.swift.sandhook.SandHook; import com.swift.sandhook.annotation.HookMethod; import com.swift.sandhook.annotation.HookMethodBackup; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/StartBootstrapServicesHooker11.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/StartBootstrapServicesHooker11.java similarity index 91% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/StartBootstrapServicesHooker11.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/StartBootstrapServicesHooker11.java index eb4bcb88..d3e56c54 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/StartBootstrapServicesHooker11.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/StartBootstrapServicesHooker11.java @@ -1,7 +1,7 @@ -package com.elderdrivers.riru.edxp.sandhook.hooker; +package io.github.lsposed.lspd.sandhook.hooker; -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.StartBootstrapServices; +import io.github.lsposed.common.KeepMembers; +import io.github.lsposed.lspd._hooker.impl.StartBootstrapServices; import com.swift.sandhook.SandHook; import com.swift.sandhook.annotation.HookMethod; import com.swift.sandhook.annotation.HookMethodBackup; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/SystemMainHooker.java b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/SystemMainHooker.java similarity index 90% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/SystemMainHooker.java rename to core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/SystemMainHooker.java index 1c0d5d95..38a0fc0d 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/sandhook/hooker/SystemMainHooker.java +++ b/core/src/main/java/io/github/lsposed/lspd/sandhook/hooker/SystemMainHooker.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.edxp.sandhook.hooker; +package io.github.lsposed.lspd.sandhook.hooker; import android.app.ActivityThread; -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.SystemMain; +import io.github.lsposed.common.KeepMembers; +import io.github.lsposed.lspd._hooker.impl.SystemMain; import com.swift.sandhook.SandHook; import com.swift.sandhook.annotation.HookClass; import com.swift.sandhook.annotation.HookMethod; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/service/PackageReceiver.java b/core/src/main/java/io/github/lsposed/lspd/service/PackageReceiver.java similarity index 95% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/service/PackageReceiver.java rename to core/src/main/java/io/github/lsposed/lspd/service/PackageReceiver.java index 69efb97b..f3594dd6 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/service/PackageReceiver.java +++ b/core/src/main/java/io/github/lsposed/lspd/service/PackageReceiver.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.service; +package io.github.lsposed.lspd.service; import android.annotation.SuppressLint; import android.app.ActivityThread; @@ -16,7 +16,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.widget.Toast; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.util.Utils; import java.io.File; import java.io.PrintWriter; @@ -30,7 +30,7 @@ import java.util.Scanner; import de.robv.android.xposed.XposedHelpers; -import static com.elderdrivers.riru.edxp.service.ServiceProxy.CONFIG_PATH; +import static io.github.lsposed.lspd.service.ServiceProxy.CONFIG_PATH; public class PackageReceiver { private static final BroadcastReceiver RECEIVER = new BroadcastReceiver() { @@ -197,10 +197,10 @@ public class PackageReceiver { Utils.logI("broadcast to " + ServiceProxy.INSTALLER_PACKAGE_NAME); } catch (Throwable t) { Utils.logW("send broadcast failed", t); - Toast.makeText(context, "EdXposed: Updated " + packageName, Toast.LENGTH_SHORT).show(); + Toast.makeText(context, "LSPosed: Updated " + packageName, Toast.LENGTH_SHORT).show(); } } else if (activated) { - Toast.makeText(context, "EdXposed: Updated " + packageName, Toast.LENGTH_SHORT).show(); + Toast.makeText(context, "LSPosed: Updated " + packageName, Toast.LENGTH_SHORT).show(); } } } catch (Throwable e) { @@ -237,7 +237,7 @@ public class PackageReceiver { intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); intentFilter.addDataScheme("package"); - HandlerThread thread = new HandlerThread("edxp-PackageReceiver"); + HandlerThread thread = new HandlerThread("lspd-PackageReceiver"); thread.start(); Handler handler = new Handler(thread.getLooper()); diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/service/ServiceProxy.java b/core/src/main/java/io/github/lsposed/lspd/service/ServiceProxy.java similarity index 95% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/service/ServiceProxy.java rename to core/src/main/java/io/github/lsposed/lspd/service/ServiceProxy.java index 1fdbe773..56955a0c 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/service/ServiceProxy.java +++ b/core/src/main/java/io/github/lsposed/lspd/service/ServiceProxy.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.service; +package io.github.lsposed.lspd.service; import android.os.Handler; import android.os.IBinder; @@ -6,8 +6,8 @@ import android.os.IServiceManager; import android.os.Looper; import android.os.ServiceManager; -import com.elderdrivers.riru.common.KeepAll; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.common.KeepAll; +import io.github.lsposed.lspd.util.Utils; import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ClassLoaderUtils.java b/core/src/main/java/io/github/lsposed/lspd/util/ClassLoaderUtils.java similarity index 97% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ClassLoaderUtils.java rename to core/src/main/java/io/github/lsposed/lspd/util/ClassLoaderUtils.java index 7d385e07..34d757f8 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ClassLoaderUtils.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/ClassLoaderUtils.java @@ -1,9 +1,9 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import android.os.Build; import android.util.ArrayMap; -import com.elderdrivers.riru.edxp.BuildConfig; +import io.github.lsposed.lspd.BuildConfig; import java.lang.reflect.Field; import java.util.ArrayList; @@ -21,7 +21,7 @@ import de.robv.android.xposed.annotation.Level; @ApiSensitive(Level.LOW) public class ClassLoaderUtils { - public static final String DEXPATH = "/system/framework/edxp.dex"; + public static final String DEXPATH = "/system/framework/lspd.dex"; public static void replaceParentClassLoader(ClassLoader appClassLoader) { if (appClassLoader == null) { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ClassUtils.java b/core/src/main/java/io/github/lsposed/lspd/util/ClassUtils.java similarity index 97% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ClassUtils.java rename to core/src/main/java/io/github/lsposed/lspd/util/ClassUtils.java index 92e86eea..a24da956 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ClassUtils.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/ClassUtils.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import android.os.Build; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/DexUtils.java b/core/src/main/java/io/github/lsposed/lspd/util/DexUtils.java similarity index 98% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/DexUtils.java rename to core/src/main/java/io/github/lsposed/lspd/util/DexUtils.java index 2233b6a4..62607ac5 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/DexUtils.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/DexUtils.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import android.annotation.TargetApi; import android.os.Build; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/FileUtils.java b/core/src/main/java/io/github/lsposed/lspd/util/FileUtils.java similarity index 95% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/FileUtils.java rename to core/src/main/java/io/github/lsposed/lspd/util/FileUtils.java index e1bd0d48..4b799c22 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/FileUtils.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/FileUtils.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import android.text.TextUtils; -import com.elderdrivers.riru.edxp.config.ConfigManager; +import io.github.lsposed.lspd.config.ConfigManager; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Hookers.java b/core/src/main/java/io/github/lsposed/lspd/util/Hookers.java similarity index 92% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Hookers.java rename to core/src/main/java/io/github/lsposed/lspd/util/Hookers.java index c7f13793..c262c6c6 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Hookers.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/Hookers.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import android.app.AndroidAppHelper; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/MetaDataReader.java b/core/src/main/java/io/github/lsposed/lspd/util/MetaDataReader.java similarity index 98% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/MetaDataReader.java rename to core/src/main/java/io/github/lsposed/lspd/util/MetaDataReader.java index bbefcb67..c517edaf 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/MetaDataReader.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/MetaDataReader.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ProcessUtils.java b/core/src/main/java/io/github/lsposed/lspd/util/ProcessUtils.java similarity index 98% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ProcessUtils.java rename to core/src/main/java/io/github/lsposed/lspd/util/ProcessUtils.java index 01b7054d..b22f131c 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ProcessUtils.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/ProcessUtils.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import android.os.Process; import android.text.TextUtils; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ProxyClassLoader.java b/core/src/main/java/io/github/lsposed/lspd/util/ProxyClassLoader.java similarity index 94% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ProxyClassLoader.java rename to core/src/main/java/io/github/lsposed/lspd/util/ProxyClassLoader.java index 8b6ab186..bcd717c0 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/ProxyClassLoader.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/ProxyClassLoader.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; public class ProxyClassLoader extends ClassLoader { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Unsafe.java b/core/src/main/java/io/github/lsposed/lspd/util/Unsafe.java similarity index 98% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Unsafe.java rename to core/src/main/java/io/github/lsposed/lspd/util/Unsafe.java index a04330f8..7f36fbd6 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Unsafe.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/Unsafe.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import android.util.Log; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Utils.java b/core/src/main/java/io/github/lsposed/lspd/util/Utils.java similarity index 91% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Utils.java rename to core/src/main/java/io/github/lsposed/lspd/util/Utils.java index cb48178e..76c154bb 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Utils.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/Utils.java @@ -1,8 +1,8 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import android.util.Log; -import com.elderdrivers.riru.edxp.BuildConfig; +import io.github.lsposed.lspd.BuildConfig; import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.annotation.ApiSensitive; @@ -11,7 +11,7 @@ import de.robv.android.xposed.annotation.Level; public class Utils { - public static final String LOG_TAG = "EdXposed"; + public static final String LOG_TAG = "LSPosed"; public static void logD(Object msg) { if (BuildConfig.DEBUG) diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Versions.java b/core/src/main/java/io/github/lsposed/lspd/util/Versions.java similarity index 86% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Versions.java rename to core/src/main/java/io/github/lsposed/lspd/util/Versions.java index 0a1bdf5b..6a3f1070 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/util/Versions.java +++ b/core/src/main/java/io/github/lsposed/lspd/util/Versions.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.util; +package io.github.lsposed.lspd.util; import android.os.Build; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java b/core/src/main/java/io/github/lsposed/lspd/yahfa/config/YahfaHookProvider.java similarity index 75% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java rename to core/src/main/java/io/github/lsposed/lspd/yahfa/config/YahfaHookProvider.java index dbac995a..42bed4b2 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java +++ b/core/src/main/java/io/github/lsposed/lspd/yahfa/config/YahfaHookProvider.java @@ -1,16 +1,16 @@ -package com.elderdrivers.riru.edxp.yahfa.config; +package io.github.lsposed.lspd.yahfa.config; -import com.elderdrivers.riru.edxp.art.ClassLinker; -import com.elderdrivers.riru.edxp.config.BaseHookProvider; -import com.elderdrivers.riru.edxp.core.ResourcesHook; -import com.elderdrivers.riru.edxp.core.Yahfa; -import com.elderdrivers.riru.edxp.yahfa.dexmaker.DynamicBridge; +import io.github.lsposed.lspd.art.ClassLinker; +import io.github.lsposed.lspd.config.BaseHookProvider; +import io.github.lsposed.lspd.core.ResourcesHook; +import io.github.lsposed.lspd.core.Yahfa; +import io.github.lsposed.lspd.yahfa.dexmaker.DynamicBridge; import java.lang.reflect.Member; import de.robv.android.xposed.XposedBridge; -import static com.elderdrivers.riru.edxp.util.ClassUtils.shouldDelayHook; +import static io.github.lsposed.lspd.util.ClassUtils.shouldDelayHook; public class YahfaHookProvider extends BaseHookProvider { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/YahfaEdxpImpl.java b/core/src/main/java/io/github/lsposed/lspd/yahfa/core/YahfaEdxpImpl.java similarity index 51% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/YahfaEdxpImpl.java rename to core/src/main/java/io/github/lsposed/lspd/yahfa/core/YahfaEdxpImpl.java index af0c6f35..7196a7a9 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/YahfaEdxpImpl.java +++ b/core/src/main/java/io/github/lsposed/lspd/yahfa/core/YahfaEdxpImpl.java @@ -1,21 +1,21 @@ -package com.elderdrivers.riru.edxp.yahfa.core; +package io.github.lsposed.lspd.yahfa.core; import android.os.Build; -import com.elderdrivers.riru.edxp.core.BaseEdxpImpl; -import com.elderdrivers.riru.edxp.core.EdxpImpl; -import com.elderdrivers.riru.edxp.core.Main; -import com.elderdrivers.riru.edxp.core.Proxy; -import com.elderdrivers.riru.edxp.core.Yahfa; -import com.elderdrivers.riru.edxp.proxy.NormalProxy; -import com.elderdrivers.riru.edxp.proxy.Router; +import io.github.lsposed.lspd.core.BaseEdxpImpl; +import io.github.lsposed.lspd.core.EdxpImpl; +import io.github.lsposed.lspd.core.Main; +import io.github.lsposed.lspd.core.Proxy; +import io.github.lsposed.lspd.core.Yahfa; +import io.github.lsposed.lspd.proxy.NormalProxy; +import io.github.lsposed.lspd.proxy.Router; public class YahfaEdxpImpl extends BaseEdxpImpl { static { - final EdxpImpl edxpImpl = new YahfaEdxpImpl(); - if (Main.setEdxpImpl(edxpImpl)) { - edxpImpl.init(); + final EdxpImpl lspdImpl = new YahfaEdxpImpl(); + if (Main.setEdxpImpl(lspdImpl)) { + lspdImpl.init(); } } diff --git a/core/src/main/java/io/github/lsposed/lspd/yahfa/core/YahfaRouter.java b/core/src/main/java/io/github/lsposed/lspd/yahfa/core/YahfaRouter.java new file mode 100644 index 00000000..0062f4b2 --- /dev/null +++ b/core/src/main/java/io/github/lsposed/lspd/yahfa/core/YahfaRouter.java @@ -0,0 +1,21 @@ +package io.github.lsposed.lspd.yahfa.core; + +import io.github.lsposed.lspd.config.LSPdConfigGlobal; +import io.github.lsposed.lspd.proxy.BaseRouter; +import io.github.lsposed.lspd.yahfa.config.YahfaHookProvider; +import io.github.lsposed.lspd.yahfa.dexmaker.DynamicBridge; + +public class YahfaRouter extends BaseRouter { + + YahfaRouter() { + } + + public void onEnterChildProcess() { + DynamicBridge.onForkPost(); + } + + public void injectConfig() { + LSPdConfigGlobal.sHookProvider = new YahfaHookProvider(); + } + +} diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexLog.java b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DexLog.java similarity index 79% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexLog.java rename to core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DexLog.java index 9f415499..7d22e080 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexLog.java +++ b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DexLog.java @@ -1,12 +1,12 @@ -package com.elderdrivers.riru.edxp.yahfa.dexmaker; +package io.github.lsposed.lspd.yahfa.dexmaker; import android.util.Log; -import com.elderdrivers.riru.edxp.BuildConfig; +import io.github.lsposed.lspd.BuildConfig; public class DexLog { - public static final String TAG = "EdXposed"; + public static final String TAG = "LSPosed"; public static int v(String s) { return Log.v(TAG, s); diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexMakerUtils.java b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DexMakerUtils.java similarity index 98% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexMakerUtils.java rename to core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DexMakerUtils.java index d977e854..1e28f28e 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DexMakerUtils.java +++ b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DexMakerUtils.java @@ -1,7 +1,7 @@ -package com.elderdrivers.riru.edxp.yahfa.dexmaker; +package io.github.lsposed.lspd.yahfa.dexmaker; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.util.Utils; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DynamicBridge.java b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java similarity index 98% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DynamicBridge.java rename to core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java index 73a5e8cb..0f7153c3 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/DynamicBridge.java +++ b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.dexmaker; +package io.github.lsposed.lspd.yahfa.dexmaker; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/HookerDexMaker.java b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java similarity index 94% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/HookerDexMaker.java rename to core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java index 7cf5cf9c..7985cb34 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/HookerDexMaker.java +++ b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java @@ -1,12 +1,12 @@ -package com.elderdrivers.riru.edxp.yahfa.dexmaker; +package io.github.lsposed.lspd.yahfa.dexmaker; import android.annotation.TargetApi; import android.os.Build; -import com.elderdrivers.riru.edxp.BuildConfig; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.core.yahfa.HookMain; -import com.elderdrivers.riru.edxp.util.ProxyClassLoader; +import io.github.lsposed.lspd.BuildConfig; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.core.yahfa.HookMain; +import io.github.lsposed.lspd.util.ProxyClassLoader; import java.io.File; import java.lang.reflect.Constructor; @@ -26,11 +26,11 @@ import external.com.android.dx.Local; import external.com.android.dx.MethodId; import external.com.android.dx.TypeId; -import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.autoBoxIfNecessary; -import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.autoUnboxIfNecessary; -import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.canCache; -import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.createResultLocals; -import static com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils.getObjTypeIdIfPrimitive; +import static io.github.lsposed.lspd.yahfa.dexmaker.DexMakerUtils.autoBoxIfNecessary; +import static io.github.lsposed.lspd.yahfa.dexmaker.DexMakerUtils.autoUnboxIfNecessary; +import static io.github.lsposed.lspd.yahfa.dexmaker.DexMakerUtils.canCache; +import static io.github.lsposed.lspd.yahfa.dexmaker.DexMakerUtils.createResultLocals; +import static io.github.lsposed.lspd.yahfa.dexmaker.DexMakerUtils.getObjTypeIdIfPrimitive; @SuppressWarnings("rawtypes") public class HookerDexMaker { diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/MethodInfo.java b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/MethodInfo.java similarity index 98% rename from edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/MethodInfo.java rename to core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/MethodInfo.java index 73e615a0..3f90bad8 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/dexmaker/MethodInfo.java +++ b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/MethodInfo.java @@ -1,4 +1,4 @@ -package com.elderdrivers.riru.edxp.yahfa.dexmaker; +package io.github.lsposed.lspd.yahfa.dexmaker; import java.lang.reflect.Constructor; import java.lang.reflect.Member; diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/XposedCompat.java b/core/src/main/java/io/swift/sandhook/xposedcompat/XposedCompat.java similarity index 91% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/XposedCompat.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/XposedCompat.java index 1ec8b1f8..3d8541c6 100644 --- a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/XposedCompat.java +++ b/core/src/main/java/io/swift/sandhook/xposedcompat/XposedCompat.java @@ -3,10 +3,10 @@ package com.swift.sandhook.xposedcompat; import android.os.Process; import android.text.TextUtils; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.util.FileUtils; -import com.elderdrivers.riru.edxp.util.ProcessUtils; -import com.elderdrivers.riru.edxp.util.ProxyClassLoader; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.util.FileUtils; +import io.github.lsposed.lspd.util.ProcessUtils; +import io.github.lsposed.lspd.util.ProxyClassLoader; import com.swift.sandhook.wrapper.HookWrapper; import com.swift.sandhook.xposedcompat.methodgen.SandHookXposedBridge; import com.swift.sandhook.xposedcompat.utils.ApplicationUtils; @@ -16,7 +16,7 @@ import java.lang.reflect.Member; import de.robv.android.xposed.XposedBridge; -import static com.elderdrivers.riru.edxp.util.FileUtils.getDataPathPrefix; +import static io.github.lsposed.lspd.util.FileUtils.getDataPathPrefix; public class XposedCompat { diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/CallOriginCallBack.java b/core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/CallOriginCallBack.java similarity index 100% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/CallOriginCallBack.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/CallOriginCallBack.java diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/HookMethodEntity.java b/core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/HookMethodEntity.java similarity index 100% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/HookMethodEntity.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/HookMethodEntity.java diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/HookStubManager.java b/core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/HookStubManager.java similarity index 99% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/HookStubManager.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/HookStubManager.java index ae98830c..e398d236 100644 --- a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/HookStubManager.java +++ b/core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/HookStubManager.java @@ -2,7 +2,7 @@ package com.swift.sandhook.xposedcompat.hookstub; import android.util.Log; -import com.elderdrivers.riru.edxp.BuildConfig; +import io.github.lsposed.lspd.BuildConfig; import com.swift.sandhook.SandHook; import com.swift.sandhook.SandHookMethodResolver; import com.swift.sandhook.utils.ParamWrapper; diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs32.java b/core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs32.java similarity index 100% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs32.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs32.java diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs64.java b/core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs64.java similarity index 100% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs64.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/hookstub/MethodHookerStubs64.java diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/ErrorCatch.java b/core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/ErrorCatch.java similarity index 100% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/ErrorCatch.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/ErrorCatch.java diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/HookMaker.java b/core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/HookMaker.java similarity index 100% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/HookMaker.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/HookMaker.java diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/HookerDexMaker.java b/core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/HookerDexMaker.java similarity index 99% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/HookerDexMaker.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/HookerDexMaker.java index 1bb3a862..a8beb44c 100644 --- a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/HookerDexMaker.java +++ b/core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/HookerDexMaker.java @@ -1,6 +1,6 @@ package com.swift.sandhook.xposedcompat.methodgen; -import com.elderdrivers.riru.edxp.config.ConfigManager; +import io.github.lsposed.lspd.config.ConfigManager; import com.swift.sandhook.SandHook; import com.swift.sandhook.SandHookMethodResolver; import com.swift.sandhook.wrapper.HookWrapper; diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/HookerDexMakerNew.java b/core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/HookerDexMakerNew.java similarity index 99% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/HookerDexMakerNew.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/HookerDexMakerNew.java index 809da68b..5afb4ac6 100644 --- a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/HookerDexMakerNew.java +++ b/core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/HookerDexMakerNew.java @@ -1,6 +1,6 @@ package com.swift.sandhook.xposedcompat.methodgen; -import com.elderdrivers.riru.edxp.config.ConfigManager; +import io.github.lsposed.lspd.config.ConfigManager; import com.swift.sandhook.SandHook; import com.swift.sandhook.wrapper.HookWrapper; import com.swift.sandhook.xposedcompat.hookstub.HookStubManager; diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/SandHookXposedBridge.java b/core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/SandHookXposedBridge.java similarity index 95% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/SandHookXposedBridge.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/SandHookXposedBridge.java index d6219a88..39e5b6c3 100644 --- a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/methodgen/SandHookXposedBridge.java +++ b/core/src/main/java/io/swift/sandhook/xposedcompat/methodgen/SandHookXposedBridge.java @@ -4,10 +4,10 @@ import android.os.Build; import android.os.Process; import android.os.Trace; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.core.Yahfa; -import com.elderdrivers.riru.edxp.util.ClassLoaderUtils; -import com.elderdrivers.riru.edxp.util.FileUtils; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.core.Yahfa; +import io.github.lsposed.lspd.util.ClassLoaderUtils; +import io.github.lsposed.lspd.util.FileUtils; import com.swift.sandhook.SandHook; import com.swift.sandhook.SandHookConfig; import com.swift.sandhook.blacklist.HookBlackList; @@ -121,10 +121,10 @@ public final class SandHookXposedBridge { public static void init() { if (Process.is64Bit()) { -// SandHookConfig.libSandHookPath = "/system/lib64/libsandhook.edxp.so"; +// SandHookConfig.libSandHookPath = "/system/lib64/libsandhook.lspd.so"; SandHookConfig.libSandHookPath = "/system/lib64/" + ConfigManager.getLibSandHookName(); } else { -// SandHookConfig.libSandHookPath = "/system/lib/libsandhook.edxp.so"; +// SandHookConfig.libSandHookPath = "/system/lib/libsandhook.lspd.so"; SandHookConfig.libSandHookPath = "/system/lib/" + ConfigManager.getLibSandHookName(); } SandHookConfig.libLoader = new SandHookConfig.LibLoader() { @@ -135,7 +135,7 @@ public final class SandHookXposedBridge { }; SandHookConfig.DEBUG = true; SandHookConfig.compiler = false; - //already impl in edxp + //already impl in lspd SandHookConfig.delayHook = false; //use when call origin HookBlackList.methodBlackList.add("java.lang.reflect.isStatic"); diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/utils/ApplicationUtils.java b/core/src/main/java/io/swift/sandhook/xposedcompat/utils/ApplicationUtils.java similarity index 100% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/utils/ApplicationUtils.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/utils/ApplicationUtils.java diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/utils/DexLog.java b/core/src/main/java/io/swift/sandhook/xposedcompat/utils/DexLog.java similarity index 95% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/utils/DexLog.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/utils/DexLog.java index f69cef61..42570cdf 100644 --- a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/utils/DexLog.java +++ b/core/src/main/java/io/swift/sandhook/xposedcompat/utils/DexLog.java @@ -2,7 +2,7 @@ package com.swift.sandhook.xposedcompat.utils; import android.util.Log; -import com.elderdrivers.riru.edxp.BuildConfig; +import io.github.lsposed.lspd.BuildConfig; import java.lang.reflect.Member; diff --git a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/utils/DexMakerUtils.java b/core/src/main/java/io/swift/sandhook/xposedcompat/utils/DexMakerUtils.java similarity index 99% rename from edxp-core/src/main/java/com/swift/sandhook/xposedcompat/utils/DexMakerUtils.java rename to core/src/main/java/io/swift/sandhook/xposedcompat/utils/DexMakerUtils.java index 8f2e9e6b..89f21fb4 100644 --- a/edxp-core/src/main/java/com/swift/sandhook/xposedcompat/utils/DexMakerUtils.java +++ b/core/src/main/java/io/swift/sandhook/xposedcompat/utils/DexMakerUtils.java @@ -1,6 +1,6 @@ package com.swift.sandhook.xposedcompat.utils; -import com.elderdrivers.riru.edxp.config.ConfigManager; -import com.elderdrivers.riru.edxp.util.Utils; +import io.github.lsposed.lspd.config.ConfigManager; +import io.github.lsposed.lspd.util.Utils; import java.io.File; import java.lang.reflect.Method; diff --git a/edxp-core/src/main/java/pxb/android/ResConst.java b/core/src/main/java/pxb/android/ResConst.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/ResConst.java rename to core/src/main/java/pxb/android/ResConst.java diff --git a/edxp-core/src/main/java/pxb/android/StringItem.java b/core/src/main/java/pxb/android/StringItem.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/StringItem.java rename to core/src/main/java/pxb/android/StringItem.java diff --git a/edxp-core/src/main/java/pxb/android/StringItems.java b/core/src/main/java/pxb/android/StringItems.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/StringItems.java rename to core/src/main/java/pxb/android/StringItems.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/ArscDumper.java b/core/src/main/java/pxb/android/arsc/ArscDumper.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/ArscDumper.java rename to core/src/main/java/pxb/android/arsc/ArscDumper.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/ArscParser.java b/core/src/main/java/pxb/android/arsc/ArscParser.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/ArscParser.java rename to core/src/main/java/pxb/android/arsc/ArscParser.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/ArscWriter.java b/core/src/main/java/pxb/android/arsc/ArscWriter.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/ArscWriter.java rename to core/src/main/java/pxb/android/arsc/ArscWriter.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/BagValue.java b/core/src/main/java/pxb/android/arsc/BagValue.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/BagValue.java rename to core/src/main/java/pxb/android/arsc/BagValue.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/Config.java b/core/src/main/java/pxb/android/arsc/Config.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/Config.java rename to core/src/main/java/pxb/android/arsc/Config.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/Pkg.java b/core/src/main/java/pxb/android/arsc/Pkg.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/Pkg.java rename to core/src/main/java/pxb/android/arsc/Pkg.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/ResEntry.java b/core/src/main/java/pxb/android/arsc/ResEntry.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/ResEntry.java rename to core/src/main/java/pxb/android/arsc/ResEntry.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/ResSpec.java b/core/src/main/java/pxb/android/arsc/ResSpec.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/ResSpec.java rename to core/src/main/java/pxb/android/arsc/ResSpec.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/Type.java b/core/src/main/java/pxb/android/arsc/Type.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/Type.java rename to core/src/main/java/pxb/android/arsc/Type.java diff --git a/edxp-core/src/main/java/pxb/android/arsc/Value.java b/core/src/main/java/pxb/android/arsc/Value.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/arsc/Value.java rename to core/src/main/java/pxb/android/arsc/Value.java diff --git a/edxp-core/src/main/java/pxb/android/axml/Axml.java b/core/src/main/java/pxb/android/axml/Axml.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/axml/Axml.java rename to core/src/main/java/pxb/android/axml/Axml.java diff --git a/edxp-core/src/main/java/pxb/android/axml/AxmlParser.java b/core/src/main/java/pxb/android/axml/AxmlParser.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/axml/AxmlParser.java rename to core/src/main/java/pxb/android/axml/AxmlParser.java diff --git a/edxp-core/src/main/java/pxb/android/axml/AxmlReader.java b/core/src/main/java/pxb/android/axml/AxmlReader.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/axml/AxmlReader.java rename to core/src/main/java/pxb/android/axml/AxmlReader.java diff --git a/edxp-core/src/main/java/pxb/android/axml/AxmlVisitor.java b/core/src/main/java/pxb/android/axml/AxmlVisitor.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/axml/AxmlVisitor.java rename to core/src/main/java/pxb/android/axml/AxmlVisitor.java diff --git a/edxp-core/src/main/java/pxb/android/axml/AxmlWriter.java b/core/src/main/java/pxb/android/axml/AxmlWriter.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/axml/AxmlWriter.java rename to core/src/main/java/pxb/android/axml/AxmlWriter.java diff --git a/edxp-core/src/main/java/pxb/android/axml/DumpAdapter.java b/core/src/main/java/pxb/android/axml/DumpAdapter.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/axml/DumpAdapter.java rename to core/src/main/java/pxb/android/axml/DumpAdapter.java diff --git a/edxp-core/src/main/java/pxb/android/axml/NodeVisitor.java b/core/src/main/java/pxb/android/axml/NodeVisitor.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/axml/NodeVisitor.java rename to core/src/main/java/pxb/android/axml/NodeVisitor.java diff --git a/edxp-core/src/main/java/pxb/android/axml/Util.java b/core/src/main/java/pxb/android/axml/Util.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/axml/Util.java rename to core/src/main/java/pxb/android/axml/Util.java diff --git a/edxp-core/src/main/java/pxb/android/axml/ValueWrapper.java b/core/src/main/java/pxb/android/axml/ValueWrapper.java similarity index 100% rename from edxp-core/src/main/java/pxb/android/axml/ValueWrapper.java rename to core/src/main/java/pxb/android/axml/ValueWrapper.java diff --git a/edxp-core/src/main/java/pxb/android/package.html b/core/src/main/java/pxb/android/package.html similarity index 100% rename from edxp-core/src/main/java/pxb/android/package.html rename to core/src/main/java/pxb/android/package.html diff --git a/edxp-core/template_override/EdXposed.apk b/core/template_override/LSPosed.apk similarity index 100% rename from edxp-core/template_override/EdXposed.apk rename to core/template_override/LSPosed.apk diff --git a/edxp-core/template_override/META-INF/com/google/android/update-binary b/core/template_override/META-INF/com/google/android/update-binary similarity index 100% rename from edxp-core/template_override/META-INF/com/google/android/update-binary rename to core/template_override/META-INF/com/google/android/update-binary diff --git a/edxp-core/template_override/META-INF/com/google/android/updater-script b/core/template_override/META-INF/com/google/android/updater-script similarity index 100% rename from edxp-core/template_override/META-INF/com/google/android/updater-script rename to core/template_override/META-INF/com/google/android/updater-script diff --git a/edxp-core/template_override/README.md b/core/template_override/README.md similarity index 55% rename from edxp-core/template_override/README.md rename to core/template_override/README.md index 994b060c..feacf1d6 100644 --- a/edxp-core/template_override/README.md +++ b/core/template_override/README.md @@ -1,6 +1,6 @@ -# EdXposed Framework +# LSPosed Framework -[简体中文](https://github.com/ElderDrivers/EdXposed/wiki/%E7%AE%80%E4%BB%8B) +[简体中文](https://github.com/ElderDrivers/LSPosed/wiki/%E7%AE%80%E4%BB%8B) ## Introduction @@ -8,12 +8,12 @@ A Riru module trying to provide an ART hooking framework (initially for Android > Xposed is a framework for modules that can change the behavior of the system and apps without touching any APKs. That's great because it means that modules can work for different versions and even ROMs without any changes (as long as the original code was not changed too much). It's also easy to undo. As all changes are done in the memory, you just need to deactivate the module and reboot to get your original system back. There are many other advantages, but here is just one more: Multiple modules can do changes to the same part of the system or app. With modified APKs, you to decide for one. No way to combine them, unless the author builds multiple APKs with different combinations. -What are the differences between EdXposed Framework and Xposed Framework? +What are the differences between LSPosed Framework and Xposed Framework? -1. EdXposed fully supports Android Pie, Q and R -2. EdXposed have App List mode. Only the apps you want to apply Xposed modules are hooked. Other apps in system run in a completely clean environment -3. EdXposed doesn't need to reboot system to active most modules -4. EdXposed is hard to detect. EdXposed use Riru to inject, doesn't modify the libart and app_process +1. LSPosed fully supports Android Pie, Q and R +2. LSPosed have App List mode. Only the apps you want to apply Xposed modules are hooked. Other apps in system run in a completely clean environment +3. LSPosed doesn't need to reboot system to active most modules +4. LSPosed is hard to detect. LSPosed use Riru to inject, doesn't modify the libart and app_process ## How to use ? @@ -21,17 +21,17 @@ To put it simply, just follow these steps: 1. Install Magisk 2. Flash the Riru Magisk module. You can find it in [Riru release page](https://github.com/RikkaApps/Riru/releases). -3. Flash the Riru - EdXposed Magisk module. You can find it in [EdXposed release page](https://github.com/ElderDrivers/EdXposed/releases). -4. Install EdXposed Manager. You can find it in [EdXposed Manager release page](https://github.com/ElderDrivers/EdXposedManager/releases). +3. Flash the Riru - LSPosed Magisk module. You can find it in [LSPosed release page](https://github.com/ElderDrivers/LSPosed/releases). +4. Install LSPosed Manager. You can find it in [LSPosed Manager release page](https://github.com/ElderDrivers/LSPosedManager/releases). 5. Reboot :) More informations in detail: -[**Official Website**](http://edxp.meowcat.org/) +[**Official Website**](http://lspd.meowcat.org/) -[**Wiki**](https://github.com/ElderDrivers/EdXposed/wiki) +[**Wiki**](https://github.com/ElderDrivers/LSPosed/wiki) -[**Telegram Channel**](https://t.me/EdXposed/) +[**Telegram Channel**](https://t.me/LSPosed/) ## Community Discussion @@ -42,6 +42,6 @@ Notice: These community group don't accept any bug report, please use [Get help] ## Get Help -- GitHub Issues: [Issues](https://github.com/ElderDrivers/EdXposed/issues/) +- GitHub Issues: [Issues](https://github.com/ElderDrivers/LSPosed/issues/) -- Notice(for Chinese): In view of the low quality of issues submitted, please read the Chinese user report first[EdXposedIssuesReport_cn](http://edxp.meowcat.org/assets/EdXposedIssuesReport_cn.txt)(If you don't read the instructions, the submitted issue is likely to be closed) +- Notice(for Chinese): In view of the low quality of issues submitted, please read the Chinese user report first[LSPosedIssuesReport_cn](http://lspd.meowcat.org/assets/LSPosedIssuesReport_cn.txt)(If you don't read the instructions, the submitted issue is likely to be closed) diff --git a/edxp-core/template_override/customize.sh b/core/template_override/customize.sh similarity index 77% rename from edxp-core/template_override/customize.sh rename to core/template_override/customize.sh index 3997d7f6..f8617edf 100644 --- a/edxp-core/template_override/customize.sh +++ b/core/template_override/customize.sh @@ -2,7 +2,7 @@ SKIPUNZIP=1 abortC() { rm -rf "${MODPATH}" - if [[ ! -f /data/adb/edxp/misc_path ]]; then + if [[ ! -f /data/adb/lspd/misc_path ]]; then [[ -d "${MISC_PATH}" ]] && rm -rf "${MISC_PATH}" fi abort "$1" @@ -71,7 +71,7 @@ LANG_CUST_INST_DONE="Welcome to" LANG_CUST_ERR_VERIFY_FAIL_1="Unable to extract verify tool!" LANG_CUST_ERR_VERIFY_FAIL_2="This zip may be corrupted, please try downloading again" -LANG_CUST_ERR_STUB="Stub install failed! Do not forget install EdXposed Manager manually" +LANG_CUST_ERR_STUB="Stub install failed! Do not forget install LSPosed Manager manually" LANG_CUST_ERR_PERM="Can't set permission" LANG_CUST_ERR_CONF_CREATE="Can't create configuration path" LANG_CUST_ERR_CONF_STORE="Can't store configuration path" @@ -95,7 +95,7 @@ LANG_UTIL_ERR_RIRU_LOW_1="or above is required" LANG_UTIL_ERR_RIRU_LOW_2="Please upgrade Riru from Magisk Manager" LANG_UTIL_ERR_REQUIRE_YAHFA_1="Architecture x86 or x86_64 detected" LANG_UTIL_ERR_REQUIRE_YAHFA_2="Only YAHFA variant supports x86 or x86_64 architecture devices" -LANG_UTIL_ERR_REQUIRE_YAHFA_3="You can download from 'Magisk Manager' or 'EdXposed Manager'" +LANG_UTIL_ERR_REQUIRE_YAHFA_3="You can download from 'Magisk Manager' or 'LSPosed Manager'" LANG_UTIL_ERR_ANDROID_UNSUPPORT_1="Unsupported Android version" LANG_UTIL_ERR_ANDROID_UNSUPPORT_2="(below Oreo)" LANG_UTIL_ERR_ANDROID_UNSUPPORT_3="Learn more from our GitHub Wiki" @@ -117,7 +117,7 @@ if [[ ${BOOTMODE} == true ]]; then fi ### lang end ### -ui_print "- EdXposed ${LANG_CUST_INST_VERSION} ${VERSION}" +ui_print "- LSPosed ${LANG_CUST_INST_VERSION} ${VERSION}" # extract verify.sh unzip -o "$ZIPFILE" 'verify.sh' -d "$TMPDIR" >&2 @@ -136,7 +136,7 @@ extract "$ZIPFILE" 'util_functions.sh' "${TMPDIR}" check_android_version check_magisk_version check_riru_version -edxp_check_architecture +lspd_check_architecture # determinate variant if [ "${ARCH}" == "arm" ]; then @@ -164,77 +164,77 @@ fi ui_print "- ${LANG_CUST_INST_EXT_FILES}" # extract module files -extract "${ZIPFILE}" 'EdXposed.apk' "${MODPATH}" +extract "${ZIPFILE}" 'LSPosed.apk' "${MODPATH}" extract "${ZIPFILE}" 'module.prop' "${MODPATH}" extract "${ZIPFILE}" 'system.prop' "${MODPATH}" extract "${ZIPFILE}" 'sepolicy.rule' "${MODPATH}" extract "${ZIPFILE}" 'post-fs-data.sh' "${MODPATH}" extract "${ZIPFILE}" 'uninstall.sh' "${MODPATH}" -extract "${ZIPFILE}" 'system/framework/edxp.dex' "${MODPATH}" +extract "${ZIPFILE}" 'system/framework/lspd.dex' "${MODPATH}" if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then ui_print "- ${LANG_CUST_INST_EXT_LIB_X86}" - extract "$ZIPFILE" 'system_x86/lib/libriru_edxp.so' "${MODPATH}" + extract "$ZIPFILE" 'system_x86/lib/libriru_lspd.so' "${MODPATH}" mv "${MODPATH}/system_x86/lib" "${MODPATH}/system/lib" if [ "$IS64BIT" = true ]; then ui_print "- ${LANG_CUST_INST_EXT_LIB_X64}" - extract "$ZIPFILE" 'system_x86/lib64/libriru_edxp.so' "${MODPATH}" + extract "$ZIPFILE" 'system_x86/lib64/libriru_lspd.so' "${MODPATH}" mv "${MODPATH}/system_x86/lib64" "${MODPATH}/system/lib64" fi else ui_print "- ${LANG_CUST_INST_EXT_LIB_ARM}" - extract "$ZIPFILE" 'system/lib/libriru_edxp.so' "${MODPATH}" - extract "$ZIPFILE" 'system/lib/libsandhook.edxp.so' "${MODPATH}" + extract "$ZIPFILE" 'system/lib/libriru_lspd.so' "${MODPATH}" + extract "$ZIPFILE" 'system/lib/libsandhook.lspd.so' "${MODPATH}" if [ "$IS64BIT" = true ]; then ui_print "- ${LANG_CUST_INST_EXT_LIB_ARM64}" - extract "$ZIPFILE" 'system/lib64/libriru_edxp.so' "${MODPATH}" - extract "$ZIPFILE" 'system/lib64/libsandhook.edxp.so' "${MODPATH}" + extract "$ZIPFILE" 'system/lib64/libriru_lspd.so' "${MODPATH}" + extract "$ZIPFILE" 'system/lib64/libsandhook.lspd.so' "${MODPATH}" fi fi if [[ ${BOOTMODE} == true ]]; then - [[ "$(pm path org.meowcat.edxposed.manager)" == "" && "$(pm path de.robv.android.xposed.installer)" == "" ]] && NO_MANAGER=true + [[ "$(pm path io.github.lsposed.manager)" == "" && "$(pm path de.robv.android.xposed.installer)" == "" ]] && NO_MANAGER=true fi if [[ ${BOOTMODE} == true && ${NO_MANAGER} == true ]]; then ui_print "- ${LANG_CUST_INST_STUB}" - cp "${MODPATH}/EdXposed.apk" "/data/local/tmp/EdXposed.apk" + cp "${MODPATH}/LSPosed.apk" "/data/local/tmp/LSPosed.apk" LOCAL_PATH_INFO=$(ls -ldZ "/data/local/tmp") LOCAL_PATH_OWNER=$(echo "${LOCAL_PATH_INFO}" | awk -F " " '{print $3":"$4}') LOCAL_PATH_CONTEXT=$(echo "${LOCAL_PATH_INFO}" | awk -F " " '{print $5}') - chcon ${LOCAL_PATH_CONTEXT} "/data/local/tmp/EdXposed.apk" - chown ${LOCAL_PATH_OWNER} "/data/local/tmp/EdXposed.apk" - (pm install "/data/local/tmp/EdXposed.apk" >/dev/null 2>&2) || ui_print " ! ${LANG_CUST_ERR_STUB}" - rm -f "/data/local/tmp/EdXposed.apk" + chcon ${LOCAL_PATH_CONTEXT} "/data/local/tmp/LSPosed.apk" + chown ${LOCAL_PATH_OWNER} "/data/local/tmp/LSPosed.apk" + (pm install "/data/local/tmp/LSPosed.apk" >/dev/null 2>&2) || ui_print " ! ${LANG_CUST_ERR_STUB}" + rm -f "/data/local/tmp/LSPosed.apk" fi ui_print "- ${LANG_CUST_INST_CONF_CREATE}" -if [[ -f /data/adb/edxp/misc_path ]]; then +if [[ -f /data/adb/lspd/misc_path ]]; then # read current MISC_PATH - MISC_PATH=$(cat /data/adb/edxp/misc_path) + MISC_PATH=$(cat /data/adb/lspd/misc_path) ui_print " - ${LANG_CUST_INST_CONF_OLD} $MISC_PATH" else # generate random MISC_PATH MISC_RAND=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16) - MISC_PATH="edxp_${MISC_RAND}" + MISC_PATH="lspd_${MISC_RAND}" ui_print " - ${LANG_CUST_INST_CONF_NEW} ${MISC_RAND}" - mkdir -p /data/adb/edxp || abortC "! ${LANG_CUST_ERR_CONF_CREATE}" - echo "$MISC_PATH" > /data/adb/edxp/misc_path || abortC "! ${LANG_CUST_ERR_CONF_STORE}" - if [[ -d /data/user_de/0/org.meowcat.edxposed.manager/conf/ ]]; then + mkdir -p /data/adb/lspd || abortC "! ${LANG_CUST_ERR_CONF_CREATE}" + echo "$MISC_PATH" > /data/adb/lspd/misc_path || abortC "! ${LANG_CUST_ERR_CONF_STORE}" + if [[ -d /data/user_de/0/io.github.lsposed.manager/conf/ ]]; then mkdir -p /data/misc/$MISC_PATH/0/conf - cp -r /data/user_de/0/org.meowcat.edxposed.manager/conf/* /data/misc/$MISC_PATH/0/conf/ + cp -r /data/user_de/0/io.github.lsposed.manager/conf/* /data/misc/$MISC_PATH/0/conf/ set_perm_recursive /data/misc/$MISC_PATH root root 0771 0660 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}" fi fi -touch /data/adb/edxp/new_install || abortC "! ${LANG_CUST_ERR_CONF_FIRST}" -set_perm_recursive /data/adb/edxp root root 0700 0600 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}" +touch /data/adb/lspd/new_install || abortC "! ${LANG_CUST_ERR_CONF_FIRST}" +set_perm_recursive /data/adb/lspd root root 0700 0600 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}" mkdir -p /data/misc/$MISC_PATH/0/conf/ || abortC "! ${LANG_CUST_ERR_CONF_CREATE}" set_perm /data/misc/$MISC_PATH root root 0771 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}" -echo "[[ -f /data/adb/edxp/keep_data ]] || rm -rf /data/misc/$MISC_PATH" >> "${MODPATH}/uninstall.sh" || abortC "! ${LANG_CUST_ERR_CONF_UNINST}" -echo "[[ -f /data/adb/edxp/new_install ]] || rm -rf /data/adb/edxp" >> "${MODPATH}/uninstall.sh" || abortC "! ${LANG_CUST_ERR_CONF_UNINST}" +echo "[[ -f /data/adb/lspd/keep_data ]] || rm -rf /data/misc/$MISC_PATH" >> "${MODPATH}/uninstall.sh" || abortC "! ${LANG_CUST_ERR_CONF_UNINST}" +echo "[[ -f /data/adb/lspd/new_install ]] || rm -rf /data/adb/lspd" >> "${MODPATH}/uninstall.sh" || abortC "! ${LANG_CUST_ERR_CONF_UNINST}" if [ $VARIANT == 17 ]; then echo "1" > /data/misc/$MISC_PATH/variant @@ -251,10 +251,10 @@ mv "${MODPATH}/system/framework" "/data/misc/$MISC_PATH/framework" mkdir -p "/data/misc/$MISC_PATH/framework/lib" -mv "${MODPATH}/system/lib/libsandhook.edxp.so" "/data/misc/$MISC_PATH/framework/lib/libsandhook.edxp.so" +mv "${MODPATH}/system/lib/libsandhook.lspd.so" "/data/misc/$MISC_PATH/framework/lib/libsandhook.lspd.so" if [ "$IS64BIT" = true ]; then mkdir -p "/data/misc/$MISC_PATH/framework/lib64" - mv "${MODPATH}/system/lib64/libsandhook.edxp.so" "/data/misc/$MISC_PATH/framework/lib64/libsandhook.edxp.so" + mv "${MODPATH}/system/lib64/libsandhook.lspd.so" "/data/misc/$MISC_PATH/framework/lib64/libsandhook.lspd.so" fi set_perm_recursive /data/misc/$MISC_PATH/framework root root 0755 0644 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}" @@ -263,20 +263,20 @@ mkdir -p /data/misc/$MISC_PATH/cache rm /data/misc/$MISC_PATH/cache/* set_perm /data/misc/$MISC_PATH/cache root root 0777 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}" -mv "${MODPATH}/system/lib/libriru_edxp.so" "${MODPATH}/system/lib/${LIB_RIRU_EDXP}" +mv "${MODPATH}/system/lib/libriru_lspd.so" "${MODPATH}/system/lib/${LIB_RIRU_EDXP}" if [[ "${IS64BIT}" == true ]]; then - mv "${MODPATH}/system/lib64/libriru_edxp.so" "${MODPATH}/system/lib64/${LIB_RIRU_EDXP}" + mv "${MODPATH}/system/lib64/libriru_lspd.so" "${MODPATH}/system/lib64/${LIB_RIRU_EDXP}" fi ui_print "- ${LANG_CUST_INST_REM_OLDCONF}" -if [[ -f "${RIRU_MODULES}/edxp.prop" ]]; then - OLD_CONFIG=$(cat "${RIRU_MODULES}/edxp.prop") +if [[ -f "${RIRU_MODULES}/lspd.prop" ]]; then + OLD_CONFIG=$(cat "${RIRU_MODULES}/lspd.prop") rm -rf "${RIRU_MODULES}/${OLD_CONFIG}" fi -if [[ -e "${RIRU_MODULES}/edxp" ]]; then - rm -rf "${RIRU_MODULES}/edxp" +if [[ -e "${RIRU_MODULES}/lspd" ]]; then + rm -rf "${RIRU_MODULES}/lspd" fi # extract Riru files @@ -284,7 +284,7 @@ ui_print "- ${LANG_CUST_INST_COPT_EXTRA}" [[ -d "${RIRU_TARGET}" ]] || mkdir -p "${RIRU_TARGET}" || abortC "! ${LANG_CUST_ERR_EXTRA_CREATE} ${RIRU_TARGET}" -echo "${RIRU_EDXP}">"${RIRU_MODULES}/edxp.prop" +echo "${RIRU_EDXP}">"${RIRU_MODULES}/lspd.prop" rm -f "${RIRU_TARGET}/module.prop" @@ -292,8 +292,8 @@ cp "${MODPATH}/module.prop" "${RIRU_TARGET}/module.prop" || abortC "! ${LANG_CUS set_perm "$RIRU_TARGET/module.prop" 0 0 0600 $RIRU_SECONTEXT || abortC "! ${LANG_CUST_ERR_PERM}" -rm -f /data/adb/edxp/keep_data +rm -f /data/adb/lspd/keep_data set_perm_recursive "${MODPATH}" 0 0 0755 0644 -ui_print "- ${LANG_CUST_INST_DONE} EdXposed ${VERSION}!" +ui_print "- ${LANG_CUST_INST_DONE} LSPosed ${VERSION}!" diff --git a/edxp-core/template_override/post-fs-data.sh b/core/template_override/post-fs-data.sh similarity index 82% rename from edxp-core/template_override/post-fs-data.sh rename to core/template_override/post-fs-data.sh index c5cee400..6653c584 100644 --- a/edxp-core/template_override/post-fs-data.sh +++ b/core/template_override/post-fs-data.sh @@ -36,7 +36,7 @@ RIRU_APICODE=$(cat "${RIRU_PATH}/api_version") MAGISK_VERSION=$(magisk -v) MAGISK_VERCODE=$(magisk -V) -#EDXP_MANAGER="org.meowcat.edxposed.manager" +#EDXP_MANAGER="io.github.lsposed.manager" #XP_INSTALLER="de.robv.android.xposed.installer" #PATH_PREFIX="/data/user_de/0/" #PATH_PREFIX_LEGACY="/data/user/0/" @@ -54,7 +54,7 @@ livePatch() { #fi #DEFAULT_BASE_PATH="${PATH_PREFIX}${EDXP_MANAGER}" -MISC_PATH=$(cat /data/adb/edxp/misc_path) +MISC_PATH=$(cat /data/adb/lspd/misc_path) BASE_PATH="/data/misc/$MISC_PATH" LOG_PATH="${BASE_PATH}/0/log" @@ -73,8 +73,8 @@ if [[ -f ${DISABLE_VERBOSE_LOG_FILE} ]]; then fi # If logcat client is kicked out by klogd server, we'll restart it. -# However, if it is killed manually or by EdXposed Manager, we'll exit. -# Refer to https://github.com/ElderDrivers/EdXposed/pull/575 for more information. +# However, if it is killed manually or by LSPosed Manager, we'll exit. +# Refer to https://github.com/ElderDrivers/LSPosed/pull/575 for more information. loop_logcat() { while true do @@ -128,31 +128,31 @@ start_log_cather () { } # install stub if manager not installed -if [[ "$(pm path org.meowcat.edxposed.manager 2>&1)" == "" && "$(pm path de.robv.android.xposed.installer 2>&1)" == "" ]]; then +if [[ "$(pm path io.github.lsposed.manager 2>&1)" == "" && "$(pm path de.robv.android.xposed.installer 2>&1)" == "" ]]; then NO_MANAGER=true fi if [[ ${NO_MANAGER} == true ]]; then - cp "${MODDIR}/EdXposed.apk" "/data/local/tmp/EdXposed.apk" + cp "${MODDIR}/LSPosed.apk" "/data/local/tmp/LSPosed.apk" LOCAL_PATH_INFO=$(ls -ldZ "/data/local/tmp") LOCAL_PATH_OWNER=$(echo "${LOCAL_PATH_INFO}" | awk -F " " '{print $3":"$4}') LOCAL_PATH_CONTEXT=$(echo "${LOCAL_PATH_INFO}" | awk -F " " '{print $5}') - chcon "${LOCAL_PATH_CONTEXT}" "/data/local/tmp/EdXposed.apk" - chown "${LOCAL_PATH_OWNER}" "/data/local/tmp/EdXposed.apk" - pm install "/data/local/tmp/EdXposed.apk" - rm -f "/data/local/tmp/EdXposed.apk" + chcon "${LOCAL_PATH_CONTEXT}" "/data/local/tmp/LSPosed.apk" + chown "${LOCAL_PATH_OWNER}" "/data/local/tmp/LSPosed.apk" + pm install "/data/local/tmp/LSPosed.apk" + rm -f "/data/local/tmp/LSPosed.apk" fi # execute live patch if rule not found [[ -f "${MODDIR}/sepolicy.rule" ]] || livePatch # start_verbose_log_catcher -start_log_cather all "EdXposed:V XSharedPreferences:V EdXposed-Bridge:V EdXposedManager:V XposedInstaller:V *:F" true ${LOG_VERBOSE} +start_log_cather all "LSPosed:V XSharedPreferences:V LSPosed-Bridge:V LSPosedManager:V XposedInstaller:V *:F" true ${LOG_VERBOSE} # start_bridge_log_catcher -start_log_cather error "XSharedPreferences:V EdXposed-Bridge:V" true true +start_log_cather error "XSharedPreferences:V LSPosed-Bridge:V" true true -if [[ -f "/data/adb/riru/modules/edxp.prop" ]]; then - CONFIG=$(cat "/data/adb/riru/modules/edxp.prop") +if [[ -f "/data/adb/riru/modules/lspd.prop" ]]; then + CONFIG=$(cat "/data/adb/riru/modules/lspd.prop") [[ -d "${TARGET}/${CONFIG}" ]] || mkdir -p "${TARGET}/${CONFIG}" cp "${MODDIR}/module.prop" "${TARGET}/${CONFIG}/module.prop" fi @@ -168,5 +168,5 @@ if [[ ! -z "${MISC_PATH}" ]]; then chmod 771 "${BASE_PATH}" chmod 777 "${BASE_PATH}/cache" fi -rm -f /data/adb/edxp/new_install -rm -f /data/adb/edxp/keep_data +rm -f /data/adb/lspd/new_install +rm -f /data/adb/lspd/keep_data diff --git a/edxp-core/template_override/sepolicy.rule b/core/template_override/sepolicy.rule similarity index 100% rename from edxp-core/template_override/sepolicy.rule rename to core/template_override/sepolicy.rule diff --git a/edxp-core/template_override/service.sh b/core/template_override/service.sh similarity index 100% rename from edxp-core/template_override/service.sh rename to core/template_override/service.sh diff --git a/edxp-core/template_override/system.prop b/core/template_override/system.prop similarity index 100% rename from edxp-core/template_override/system.prop rename to core/template_override/system.prop diff --git a/core/template_override/uninstall.sh b/core/template_override/uninstall.sh new file mode 100644 index 00000000..03133d4d --- /dev/null +++ b/core/template_override/uninstall.sh @@ -0,0 +1,27 @@ +#!/sbin/sh + +MODDIR=${0%/*} +VARIANT="YAHFA" +REMOVE=false + +[[ "$(echo ${MODDIR} | grep sandhook)" != "" ]] && VARIANT="SandHook" + +if [[ "${VARIANT}" == "SandHook" ]]; then + [[ -f "${MODDIR}/../riru_lsposed/module.prop" ]] || REMOVE=true +else + [[ -f "${MODDIR}/../riru_lsposed_sandhook/module.prop" ]] || REMOVE=true +fi + +if [[ "${REMOVE}" == true ]]; then + rm -rf /data/misc/riru/modules/lspd + if [[ -f "/data/adb/riru/modules/lspd.prop" ]]; then + OLD_CONFIG=$(cat "/data/adb/riru/modules/lspd.prop") + rm -rf "/data/adb/riru/modules/${OLD_CONFIG}" + rm "/data/adb/riru/modules/lspd.prop" + fi + if [[ -f "/data/misc/riru/modules/lspd.prop" ]]; then + OLD_CONFIG=$(cat "/data/misc/riru/modules/lspd.prop") + rm -rf "/data/misc/riru/modules/${OLD_CONFIG}" + rm "/data/misc/riru/modules/lspd.prop" + fi +fi diff --git a/edxp-core/template_override/util_functions.sh b/core/template_override/util_functions.sh similarity index 92% rename from edxp-core/template_override/util_functions.sh rename to core/template_override/util_functions.sh index 896bfe70..f7fc5104 100644 --- a/edxp-core/template_override/util_functions.sh +++ b/core/template_override/util_functions.sh @@ -43,10 +43,10 @@ require_yahfa() { } duplicate_installation() { - touch /data/adb/edxp/keep_data + touch /data/adb/lspd/keep_data ui_print "${POUNDS}" ui_print "! ${LANG_UTIL_ERR_DUPINST_1}" - ui_print "! ${LANG_UTIL_ERR_DUPINST_2} EdXposed (${1}) ${LANG_UTIL_ERR_DUPINST_3}" + ui_print "! ${LANG_UTIL_ERR_DUPINST_2} LSPosed (${1}) ${LANG_UTIL_ERR_DUPINST_3}" abortC "${POUNDS}" } @@ -54,11 +54,11 @@ require_new_android() { ui_print "${POUNDS}" ui_print "! ${LANG_UTIL_ERR_ANDROID_UNSUPPORT_1} ${1} ${LANG_UTIL_ERR_ANDROID_UNSUPPORT_2}" ui_print "! ${LANG_UTIL_ERR_ANDROID_UNSUPPORT_3}" - [[ ${BOOTMODE} == true ]] && am start -a android.intent.action.VIEW -d https://github.com/ElderDrivers/EdXposed/wiki/Available-Android-versions + [[ ${BOOTMODE} == true ]] && am start -a android.intent.action.VIEW -d https://github.com/ElderDrivers/LSPosed/wiki/Available-Android-versions abortC "${POUNDS}" } -edxp_check_architecture() { +lspd_check_architecture() { if [[ "${ARCH}" != "arm" && "${ARCH}" != "arm64" && "${ARCH}" != "x86" && "${ARCH}" != "x64" ]]; then abortC "! ${LANG_UTIL_ERR_PLATFORM_UNSUPPORT}: ${ARCH}" else diff --git a/edxp-core/template_override/verify.sh b/core/template_override/verify.sh similarity index 100% rename from edxp-core/template_override/verify.sh rename to core/template_override/verify.sh diff --git a/edxp-core/template_override/zh_CN.sh b/core/template_override/zh_CN.sh similarity index 93% rename from edxp-core/template_override/zh_CN.sh rename to core/template_override/zh_CN.sh index 951cc028..f8be8b3c 100644 --- a/edxp-core/template_override/zh_CN.sh +++ b/core/template_override/zh_CN.sh @@ -18,7 +18,7 @@ LANG_CUST_INST_COPT_EXTRA="正在复制文件" LANG_CUST_INST_DONE="欢迎使用" LANG_CUST_ERR_VERIFY_FAIL="无法解压校验工具!" -LANG_CUST_ERR_STUB="管理器预装失败! 请手动安装 EdXposed Manager" +LANG_CUST_ERR_STUB="管理器预装失败! 请手动安装 LSPosed Manager" LANG_CUST_ERR_PERM="无法设置权限" LANG_CUST_ERR_CONF_CREATE="无法创建配置路径" LANG_CUST_ERR_CONF_STORE="无法写入配置路径" @@ -42,7 +42,7 @@ LANG_UTIL_ERR_RIRU_LOW_1="或更高版本需要被安装" LANG_UTIL_ERR_RIRU_LOW_2="请先从 Magisk Manager 中升级 Riru" LANG_UTIL_ERR_REQUIRE_YAHFA_1="侦测到 x86 或 x86_64 架构" LANG_UTIL_ERR_REQUIRE_YAHFA_2="仅 YAHFA 支持 x86 或 x86_64 架构的设备" -LANG_UTIL_ERR_REQUIRE_YAHFA_3="可从 'Magisk Manager' 或 'EdXposed Manager' 中下载" +LANG_UTIL_ERR_REQUIRE_YAHFA_3="可从 'Magisk Manager' 或 'LSPosed Manager' 中下载" LANG_UTIL_ERR_ANDROID_UNSUPPORT_1="不支持的 Android 版本" LANG_UTIL_ERR_ANDROID_UNSUPPORT_2="(Oreo 以下版本)" LANG_UTIL_ERR_ANDROID_UNSUPPORT_3="从我们的 GitHub Wiki 中了解更多" diff --git a/edxp-core/tpl/module.prop.tpl b/core/tpl/module.prop.tpl similarity index 100% rename from edxp-core/tpl/module.prop.tpl rename to core/tpl/module.prop.tpl diff --git a/edxp-core/misc/EdXposedUninstaller/EdXposedUninstaller_rec-v3.zip b/edxp-core/misc/EdXposedUninstaller/EdXposedUninstaller_rec-v3.zip deleted file mode 100644 index 32e67affc7484df3b3e8bc65e58092ef8276edea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2575 zcmai03p|tSAAgORO_Xco(g^9_<`&AOi^AcUxuuDm%nUniHgl=18@ZjR?6AL%+6n*M z#fmZvp;!qaQw^sh+0m(_8>!gYI<5cG>2sdmJn!%K{XWn0dp@7<2YDz@HkJ6({TXm?BB&u+XWZYr{FI5J7bwR?%Hgy%DIacjw0e^B9_iU z{~Hn5m@J<~7*8NLl0wn?)k4J_RVz5+N3+73{i2Djr z&DC(^P?BdVQQi~M^~evEt{ZJ*^f+ShvU?tSD%`Vd3hli8?E~%{1EDKlw2lu6X&T{? z=VlYU46=Qqg)i>a<{3V{low|Cg7(x$9fUW0cdVhDZ)pLy^q5}RT8KF40SupA{(LSm zqp$7VWl`ePg^*n?AFPV*Yc@BBCI7MM2Tl4ZtGO`_byTs&z1;fji}Sw6Th;SJ)@$sjp%MkIwbQ(8GeQqoli5Q?=rZs@o{SEG6I z4&wqAX4L*diY5`GJYBI^kb8jB)9udO#YXirD&{lG14U_wHQKGaAKMm#8yq&hzq-2R zD2-x8j{;*~RrR#`xpw;68Rn|Uc?IOrs;166zmTsr>+9UXBjkf^bmmjsah^Py%Z5vX zXZ15^SD7hKQ}h@W@@5e_}c^Y z(J5Nv$$ieHKevfm7E%TV`f1qwXv)>`it^4xtLP?t_FjsMKiPlKWKXVR9#R8H&h9d= zZDa^dn2MWVibr_YG0KOJ|Mz8VcQ=aBpA=~BxQe$8S8nB@B8cqthcw?|KTz}$_@UL& z(+^43<^eF{Zjjp6(@G9%6D-Y&_6%NZdPoW~DsLV6xs;ZiaEhP7_&)SZ#>daJi zU;^e)ir%*MIg`{Z?^edP6IsY-i?Oa6wVelV-KDJ&Tz9tc@YQCWQ%~9Qzuo5fdt#GK z%~(zqbvl!k--Ca-mhiZ;IC;&65#6M^nhS@5OBR|(ry?8G=Rxh%#+>H+j6Dn9C~2me!ph(Ew23ditpF%ynO!d6)sg|j6JeR_*zdFVht^I4{>QV92bmV z%FAZw)xL1@F#v4jY64S%D z!b{@==kw`N_!4>sZ`BUYdK@Znf;3T0s>;D=aG~j8c$JxH#}^RSdp!Ic2#v^|_X7944o&+DJD;(*$1@f$Dh0 zdeKCb8`2s}#GW>B?SHD^KK`BCmHPU~C)RK{cp;UFfzu>&>*= zX5kU-t`pwRZzgKLhwi?S>u+fO@JwBJ6Qptfn6*x+Jw5iZ(b@MSBEmi9nc~ou7ZBU> z7JGb-+ilqYW|kMj7)}PQwmB0!z81Q!tu@=q%g+9=VRdO?M$kqDuA1s1bTWXv%kqzF z0{^k9GF9K~gkbvbIJM~Gmc6I6?+XSy=>vU><4=k}^)`Bd?dzD(Hq&0`hjwSq*`}u| zz0$iWz#kRXsp|j8XYS}y*m+LHX%@*0f_ViqeEA2}0xWJ1Q-(Ghgoe{Ik5!DmWLtGO zGx^+teF(b#^Y}1~;gS6LvLo9kk;_gG)g^W6=&QR7nIpW*)){WWu+mF9YuO8BHp+eG z!*Ldm*sLlgN21zAOi=8r)VHi{fBHaYYT-6G_^i*$eb(9S8=W@bU>6o4hVmf=Sl6o8 zK@?PPhw0o2HtOx3eJ3&_?WY3`v@9`ex6c{zLj}o{%OZlwd+)0Dy9SVvJMVy%ilM|^ zPf}v$f?W=Ow<77OEv&HZzR*9j*^!l??`fo0YgREEVm*pda5Jqd!IN?yPNr&g)c;9j zpo!s*%=yvl5$f0KRex)yah=}bM4W;CocpF%C$0GM`WiEWCb_dSn&8~ zJ60$7HB=m3keBEgOe_%q5Wy)z6H{9&?ZjIA}4malIFvMj0JV38(EmQA`QcNwz+1r*xrTo=RD6 g#tR3c/dev/null | grep /tmp >/dev/null -if [ "$?" -eq "0" ]; then - OUTFD=0 - - for FD in `ls /proc/$$/fd`; do - readlink /proc/$$/fd/$FD 2>/dev/null | grep pipe >/dev/null - if [ "$?" -eq "0" ]; then - ps | grep " 3 $FD " | grep -v grep >/dev/null - if [ "$?" -eq "0" ]; then - OUTFD=$FD - break - fi - fi - done -fi - -mkdir -p $INSTALLER -cd $INSTALLER -unzip -o "$ZIP" common/* replace.txt - -########################################################################################## -# Functions -########################################################################################## - -ui_print() { - echo -n -e "ui_print $1\n" >> /proc/self/fd/$OUTFD - echo -n -e "ui_print\n" >> /proc/self/fd/$OUTFD -} - -grep_prop() { - REGEX="s/^$1=//p" - shift - FILES=$@ - if [ -z "$FILES" ]; then - FILES='/system/build.prop' - fi - cat $FILES 2>/dev/null | sed -n $REGEX | head -n 1 -} - -is_mounted() { - if [ ! -z "$2" ]; then - cat /proc/mounts | grep $1 | grep $2, >/dev/null - else - cat /proc/mounts | grep $1 >/dev/null - fi - return $? -} - -set_perm() { - chown $2:$3 $1 || exit 1 - chmod $4 $1 || exit 1 - if [ "$5" ]; then - chcon $5 $1 2>/dev/null - else - chcon 'u:object_r:system_file:s0' $1 2>/dev/null - fi -} - -set_perm_recursive() { - find $1 -type d 2>/dev/null | while read dir; do - set_perm $dir $2 $3 $4 $6 - done - find $1 -type f 2>/dev/null | while read file; do - set_perm $file $2 $3 $5 $6 - done -} - -mktouch() { - mkdir -p ${1%/*} - if [ -z "$2" ]; then - touch $1 - else - echo $2 > $1 - fi -} - -payload_size_check() { - reqSizeM=0; - for entry in $(unzip -l "$@" 2>/dev/null | tail -n +4 | awk '{ print $1 }'); do - test $entry != "--------" && reqSizeM=$((reqSizeM + entry)) || break; - done; - test $reqSizeM -lt 1048576 && reqSizeM=1 || reqSizeM=$((reqSizeM / 1048576)); -} - -target_size_check() { - e2fsck -p -f $1 - curBlocks=`e2fsck -n $1 2>/dev/null | cut -d, -f3 | cut -d\ -f2`; - curUsedM=$((`echo "$curBlocks" | cut -d/ -f1` * 4 / 1024)); - curSizeM=$((`echo "$curBlocks" | cut -d/ -f2` * 4 / 1024)); - curFreeM=$((curSizeM - curUsedM)); -} - -remove_edxposed() { - ui_print "- Deleting EdXposed..." - rm -r -f /data/adb/modules/riru_edxposed/ - rm -r -f /data/adb/modules/riru_edxposed_sandhook/ - rm -r -f /data/misc/riru/modules/edxposed/ - rm -r -f /data/misc/riru/modules/edxp/ - ui_print "- Done" -} -########################################################################################## -# Preparation -########################################################################################## - -# Print your mod name -ui_print "*******************************" -ui_print " EdXposed Uninstaller " -ui_print "*******************************" - -mount /data 2>/dev/null - -if [ -d "/data/adb/magisk/" ]; then - -remove_edxposed -exit 0 - -fi - -mount /cache 2>/dev/null -umount /magisk 2>/dev/null -mkdir /magisk 2>/dev/null -IMG= - -if (is_mounted /data); then - IMG=/data/adb/magisk.img - if [ ! -f "$IMG" ]; then - ui_print "! Magisk is not installed!" - ui_print "! Magisk is required for this mod!" - exit 1 - fi -else - IMG=/cache/magisk.img - if [ ! -f "$IMG" ]; then - ui_print " " - ui_print "***********************************" - ui_print "* !! Data unavalible !! *" - ui_print "* Magisk detection is impossible *" - ui_print "* Installation will still proceed *" - ui_print "* But please make sure you have *" - ui_print "* Magisk installed!! *" - ui_print "***********************************" - ui_print " " - fi -fi - -if [ -f "$IMG" ]; then - ui_print "- $IMG detected!" - target_size_check $IMG - if [ "$reqSizeM" -gt "$curFreeM" ]; then - SIZE=$((((reqSizeM + curUsedM) / 32 + 2) * 32)) - ui_print "- Resizing $IMG to ${SIZE}M..." - resize2fs $IMG ${SIZE}M - fi -else - ui_print "! $IMG not detected!" - ui_print "! Abort" - exit 1 -fi - -ui_print "- Mounting $IMG to /magisk" -LOOPDEVICE= -for LOOP in 0 1 2 3 4 5 6 7; do - if (! is_mounted /magisk); then - LOOPDEVICE=/dev/block/loop$LOOP - if [ ! -f "$LOOPDEVICE" ]; then - mknod $LOOPDEVICE b 7 $LOOP - fi - losetup $LOOPDEVICE $IMG - if [ "$?" -eq "0" ]; then - mount -t ext4 -o loop $LOOPDEVICE /magisk - if (! is_mounted /magisk); then - /system/bin/toolbox mount -t ext4 -o loop $LOOPDEVICE /magisk - fi - if (! is_mounted /magisk); then - /system/bin/toybox mount -t ext4 -o loop $LOOPDEVICE /magisk - fi - fi - if (is_mounted /magisk); then - break; - fi - fi -done - -remove_edxposed -exit 0 diff --git a/edxp-core/misc/EdXposedUninstaller/META-INF/com/google/android/updater-script b/edxp-core/misc/EdXposedUninstaller/META-INF/com/google/android/updater-script deleted file mode 100644 index 67d29028..00000000 --- a/edxp-core/misc/EdXposedUninstaller/META-INF/com/google/android/updater-script +++ /dev/null @@ -1 +0,0 @@ -# this is a dummy file, the magic is in update-binary \ No newline at end of file diff --git a/edxp-core/src/main/AndroidManifest.xml b/edxp-core/src/main/AndroidManifest.xml deleted file mode 100644 index ac58c54b..00000000 --- a/edxp-core/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/edxp-core/src/main/cpp/external/Dobby b/edxp-core/src/main/cpp/external/Dobby deleted file mode 160000 index 782727f2..00000000 --- a/edxp-core/src/main/cpp/external/Dobby +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 782727f269d4776ccfe6b27d1e310c0001c9f6ea diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/common/KeepAll.java b/edxp-core/src/main/java/com/elderdrivers/riru/common/KeepAll.java deleted file mode 100644 index 173ad0b9..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/common/KeepAll.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.elderdrivers.riru.common; - -public interface KeepAll { -} diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/common/KeepMembers.java b/edxp-core/src/main/java/com/elderdrivers/riru/common/KeepMembers.java deleted file mode 100644 index 6f83c576..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/common/KeepMembers.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.elderdrivers.riru.common; - -public interface KeepMembers { -} diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/YahfaRouter.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/YahfaRouter.java deleted file mode 100644 index e24d9fb1..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/yahfa/core/YahfaRouter.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.elderdrivers.riru.edxp.yahfa.core; - -import com.elderdrivers.riru.edxp.config.EdXpConfigGlobal; -import com.elderdrivers.riru.edxp.proxy.BaseRouter; -import com.elderdrivers.riru.edxp.yahfa.config.YahfaHookProvider; -import com.elderdrivers.riru.edxp.yahfa.dexmaker.DynamicBridge; - -public class YahfaRouter extends BaseRouter { - - YahfaRouter() { - } - - public void onEnterChildProcess() { - DynamicBridge.onForkPost(); - } - - public void injectConfig() { - EdXpConfigGlobal.sHookProvider = new YahfaHookProvider(); - } - -} diff --git a/edxp-core/template_override/uninstall.sh b/edxp-core/template_override/uninstall.sh deleted file mode 100644 index 0720d701..00000000 --- a/edxp-core/template_override/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/sh - -MODDIR=${0%/*} -VARIANT="YAHFA" -REMOVE=false - -[[ "$(echo ${MODDIR} | grep sandhook)" != "" ]] && VARIANT="SandHook" - -if [[ "${VARIANT}" == "SandHook" ]]; then - [[ -f "${MODDIR}/../riru_edxposed/module.prop" ]] || REMOVE=true -else - [[ -f "${MODDIR}/../riru_edxposed_sandhook/module.prop" ]] || REMOVE=true -fi - -if [[ "${REMOVE}" == true ]]; then - rm -rf /data/misc/riru/modules/edxp - if [[ -f "/data/adb/riru/modules/edxp.prop" ]]; then - OLD_CONFIG=$(cat "/data/adb/riru/modules/edxp.prop") - rm -rf "/data/adb/riru/modules/${OLD_CONFIG}" - rm "/data/adb/riru/modules/edxp.prop" - fi - if [[ -f "/data/misc/riru/modules/edxp.prop" ]]; then - OLD_CONFIG=$(cat "/data/misc/riru/modules/edxp.prop") - rm -rf "/data/misc/riru/modules/${OLD_CONFIG}" - rm "/data/misc/riru/modules/edxp.prop" - fi -fi diff --git a/key-selector/src/main/AndroidManifest.xml b/key-selector/src/main/AndroidManifest.xml index cbe21451..10690d89 100644 --- a/key-selector/src/main/AndroidManifest.xml +++ b/key-selector/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="io.github.lsposed.lspd.key_selector"> \ No newline at end of file diff --git a/key-selector/src/main/cpp/Languages.h b/key-selector/src/main/cpp/Languages.h index f889a818..4e4ebb16 100644 --- a/key-selector/src/main/cpp/Languages.h +++ b/key-selector/src/main/cpp/Languages.h @@ -2,8 +2,8 @@ // Created by 双草酸酯 on 1/26/21. // -#ifndef EDXPOSED_LANGUAGES_H -#define EDXPOSED_LANGUAGES_H +#ifndef LSPOSED_LANGUAGES_H +#define LSPOSED_LANGUAGES_H #include class Languages { @@ -34,4 +34,4 @@ public: } }; -#endif //EDXPOSED_LANGUAGES_H +#endif //LSPOSED_LANGUAGES_H diff --git a/sandhook-hooklib/build.gradle b/sandhook-hooklib/build.gradle index 77e75277..bb106263 100644 --- a/sandhook-hooklib/build.gradle +++ b/sandhook-hooklib/build.gradle @@ -49,12 +49,12 @@ afterEvaluate { def libPathRelease = "${buildDir}/intermediates/cmake/${variantNameLowered}/obj" doLast { copy { - include "libsandhook.edxp.so" + include "libsandhook.lspd.so" from "${libPathRelease}/armeabi-v7a" into "${zipPathMagiskReleasePath}/system/lib" } copy { - include "libsandhook.edxp.so" + include "libsandhook.lspd.so" from "${libPathRelease}/arm64-v8a" into "${zipPathMagiskReleasePath}/system/lib64" } diff --git a/sandhook-hooklib/src/main/cpp/CMakeLists.txt b/sandhook-hooklib/src/main/cpp/CMakeLists.txt index 7e62adef..87430b32 100644 --- a/sandhook-hooklib/src/main/cpp/CMakeLists.txt +++ b/sandhook-hooklib/src/main/cpp/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.4.1) -project(sandhook.edxp) +project(sandhook.lspd) ENABLE_LANGUAGE(ASM) diff --git a/settings.gradle b/settings.gradle index e8f128de..f0f95ef5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':edxp-core', ':hiddenapi-stubs', ':sandhook-hooklib', ':sandhook-annotation', ':app', ':key-selector' +include ':core', ':hiddenapi-stubs', ':sandhook-hooklib', ':sandhook-annotation', ':app', ':key-selector'