Make naming scheme more meaningful

Change-Id: Ifcaf00c760ff452b0e85a88b54e91ca0f2f4644a

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

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

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
 

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

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.