Skip to content

Commit

Permalink
Revert special handling for HTC's ub.jar
Browse files Browse the repository at this point in the history
This basically reverts e414232, which
used to enforce recompiling ub.odex. This is no longer necessary with
the latest fix in Xposed's ART variant, as they allow apps to run
directly from the .odex file if it couldn't be recompiled.
  • Loading branch information
rovo89 committed May 3, 2016
1 parent e414232 commit 537332f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
13 changes: 0 additions & 13 deletions xposed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ bool initialize(bool zygote, bool startSystemServer, const char* className, int
printRomInfo();

if (startSystemServer) {
#if PLATFORM_SDK_VERSION >= 21
htcAdjustSystemServerClassPath();
#endif
if (!xposed::service::startAll())
return false;
#if XPOSED_WITH_SELINUX
Expand Down Expand Up @@ -333,16 +330,6 @@ bool addJarToClasspath() {
}
}

#if PLATFORM_SDK_VERSION >= 21
/** On HTC ROMs, ensure that ub.jar is compiled before the system server is started. */
void htcAdjustSystemServerClassPath() {
if (access("/system/framework/ub.jar", F_OK) != 0)
return;

addPathToEnv("SYSTEMSERVERCLASSPATH", "/system/framework/ub.jar");
}
#endif

/** Callback which checks the loaded shared libraries for libdvm/libart. */
static bool determineRuntime(const char** xposedLibPath) {
FILE *fp = fopen("/proc/self/maps", "r");
Expand Down
3 changes: 0 additions & 3 deletions xposed.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ namespace xposed {
bool shouldSkipSafemodeDelay();
bool shouldIgnoreCommand(int argc, const char* const argv[]);
bool addJarToClasspath();
#if PLATFORM_SDK_VERSION >= 21
void htcAdjustSystemServerClassPath();
#endif
void onVmCreated(JNIEnv* env);
void setProcessName(const char* name);
void dropCapabilities(int8_t keep[] = NULL);
Expand Down

0 comments on commit 537332f

Please sign in to comment.