DO NOT MERGE Android 8.0 stuff (95e80075) · Commits · e / tools / etwrp

crypto/ext4crypt/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ LOCAL_CFLAGS :=
		LOCAL_SRC_FILES := Decrypt.cpp Ext4Crypt.cpp Keymaster.cpp KeyStorage.cpp ScryptParameters.cpp Utils.cpp HashPassword.cpp ext4_crypt.cpp
		LOCAL_SHARED_LIBRARIES := libselinux libc libc++ libext4_utils libsoftkeymaster libbase libcrypto libcutils libkeymaster_messages libhardware libprotobuf-cpp-lite
		LOCAL_STATIC_LIBRARIES := libscrypt_static
		LOCAL_C_INCLUDES := system/extras/ext4_utils external/scrypt/lib/crypto system/security/keystore hardware/libhardware/include/hardware system/security/softkeymaster/include/keymaster system/keymaster/include
		LOCAL_C_INCLUDES := system/extras/ext4_utils system/extras/ext4_utils/include/ext4_utils external/scrypt/lib/crypto system/security/keystore hardware/libhardware/include/hardware system/security/softkeymaster/include/keymaster system/keymaster/include

		ifneq ($(wildcard hardware/libhardware/include/hardware/keymaster0.h),)
		LOCAL_CFLAGS += -DTW_CRYPTO_HAVE_KEYMASTERX

+2 −0

Original line number	Diff line number	Diff line
		@@ -3,7 +3,9 @@ LOCAL_PATH := $(call my-dir)
		# Build libgpt_twrp library

		include $(CLEAR_VARS)
		ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 26; echo $$?),0)
		LOCAL_CLANG := false
		endif
		LOCAL_MODULE := libgpt_twrp
		LOCAL_MODULE_TAGS := optional

+5 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		#include <unistd.h>
		#include <sys/time.h>
		#include <sys/resource.h>
		#include <sys/limits.h>

		#include "c.h"
		#include "fileutils.h"
		@@ -18,6 +19,10 @@
		#define _PATH_TMP "/tmp/"
		#endif

		#ifndef OPEN_MAX
		#define OPEN_MAX 256
		#endif

		/* Create open temporary file in safe way. Please notice that the
		* file permissions are -rw------- by default. */
		int xmkstemp(char *tmpname, char dir)

+2 −0

Original line number	Diff line number	Diff line
		@@ -89,7 +89,9 @@ endif
		#

		include $(CLEAR_VARS)
		ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 26; echo $$?),0)
		LOCAL_CLANG := false
		endif
		LOCAL_MODULE:= libpixelflinger_twrp
		LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES)
		LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)

+3 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,9 @@ LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libdl libcutils libutil
		ifneq ($(TW_MTP_DEVICE),)
		LOCAL_CFLAGS += -DUSB_MTP_DEVICE=$(TW_MTP_DEVICE)
		endif
		ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0)
		LOCAL_CFLAGS += -DHAS_USBHOST_TIMEOUT
		endif

		include $(BUILD_SHARED_LIBRARY)