diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | adb_install.cpp | 2 | ||||
| -rw-r--r-- | etc/Android.mk | 4 | ||||
| -rw-r--r-- | etc/init.recovery.service21.rc (renamed from etc/init.recovery.serviceold.rc) | 0 | ||||
| -rw-r--r-- | etc/init.recovery.service22.rc (renamed from etc/init.recovery.servicenew.rc) | 0 | ||||
| -rw-r--r-- | twinstall.cpp | 2 | ||||
| -rw-r--r-- | verifier24/README | 2 | ||||
| -rw-r--r-- | verifier24/verifier.cpp (renamed from oldverifier/verifier.cpp) | 0 | ||||
| -rw-r--r-- | verifier24/verifier.h (renamed from oldverifier/verifier.h) | 0 |
9 files changed, 7 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index 1e894f1f5..eafb1fa71 100644 --- a/Android.mk +++ b/Android.mk @@ -574,7 +574,7 @@ endif ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) LOCAL_SHARED_LIBRARIES += libmincrypttwrp LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes - LOCAL_SRC_FILES += oldverifier/verifier.cpp + LOCAL_SRC_FILES += verifier24/verifier.cpp LOCAL_CFLAGS += -DUSE_OLD_VERIFIER else LOCAL_SHARED_LIBRARIES += libcrypto diff --git a/adb_install.cpp b/adb_install.cpp index a4655dc97..448d61746 100644 --- a/adb_install.cpp +++ b/adb_install.cpp @@ -32,7 +32,7 @@ #include "minadbd/fuse_adb_provider.h" #include "fuse_sideload.h" #ifdef USE_OLD_VERIFIER -#include "oldverifier/verifier.h" +#include "verifier24/verifier.h" #else #include "verifier.h" #endif diff --git a/etc/Android.mk b/etc/Android.mk index 461457787..decd3e2d6 100644 --- a/etc/Android.mk +++ b/etc/Android.mk @@ -38,7 +38,7 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 22; echo $$?),0) LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) - LOCAL_SRC_FILES := init.recovery.servicenew.rc + LOCAL_SRC_FILES := init.recovery.service22.rc include $(BUILD_PREBUILT) else include $(CLEAR_VARS) @@ -47,7 +47,7 @@ else LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) - LOCAL_SRC_FILES := init.recovery.serviceold.rc + LOCAL_SRC_FILES := init.recovery.service21.rc include $(BUILD_PREBUILT) endif diff --git a/etc/init.recovery.serviceold.rc b/etc/init.recovery.service21.rc index 892b226ff..892b226ff 100644 --- a/etc/init.recovery.serviceold.rc +++ b/etc/init.recovery.service21.rc diff --git a/etc/init.recovery.servicenew.rc b/etc/init.recovery.service22.rc index bb2853c1a..bb2853c1a 100644 --- a/etc/init.recovery.servicenew.rc +++ b/etc/init.recovery.service22.rc diff --git a/twinstall.cpp b/twinstall.cpp index 485eb6065..c2f98febc 100644 --- a/twinstall.cpp +++ b/twinstall.cpp @@ -33,7 +33,7 @@ #include "minzip/SysUtil.h" #include "minzip/Zip.h" #ifdef USE_OLD_VERIFIER -#include "oldverifier/verifier.h" +#include "verifier24/verifier.h" #else #include "verifier.h" #endif diff --git a/verifier24/README b/verifier24/README new file mode 100644 index 000000000..44d9422e9 --- /dev/null +++ b/verifier24/README @@ -0,0 +1,2 @@ +This is older code from Android 5.1 Marshmallow (SDK ver 24) and older +that still used mincrypt instead of libcrypto. diff --git a/oldverifier/verifier.cpp b/verifier24/verifier.cpp index 98c733732..98c733732 100644 --- a/oldverifier/verifier.cpp +++ b/verifier24/verifier.cpp diff --git a/oldverifier/verifier.h b/verifier24/verifier.h index 17ab257ad..17ab257ad 100644 --- a/oldverifier/verifier.h +++ b/verifier24/verifier.h |