diff options
| author | Chaosmaster <chaosmaster@chaosv.de> | 2020-02-07 00:22:57 +0100 |
|---|---|---|
| committer | nebrassy <nebras30@gmail.com> | 2020-04-26 11:52:56 +0200 |
| commit | 3df433b483576915ff02f1ac4114ac540c3108f1 (patch) | |
| tree | 008a8902b2dee85fcf6948f5a2dea0e988cc0e2b | |
| parent | 79f442c6af70ac9fd6dd9435f2be6719cce7eac1 (diff) | |
libresetprop: integrate into twrp-build
Change-Id: I63ec7efa3545ed3b1cf15f824e7e236b1f95e76d
| -rw-r--r-- | Android.mk | 17 | ||||
| -rw-r--r-- | prebuilt/Android.mk | 2 | ||||
| -rw-r--r-- | resetprop/Android.mk | 70 |
3 files changed, 62 insertions, 27 deletions
@@ -20,4 +20,21 @@ LIBPCRE2 := $(EXT_PATH)/pcre/include MAGISK_CFLAGS += -D__MVSTR="TWRP-dynamic" -D__MCODE="ed58cf9" MAGISK_CFLAGS += -Wno-unused-parameter -std=c++14 -Wno-sign-compare +ifeq ($(TW_INCLUDE_RESETPROP), true) + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) + TW_INCLUDE_RESETPROP_PREBUILT := true + else + TW_INCLUDE_RESETPROP_SOURCE := true + TW_INCLUDE_LIBRESETPROP := true + endif +endif + +ifeq ($(TW_INCLUDE_LIBRESETPROP), true) + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) + TW_INCLUDE_LIBRESETPROP_PREBUILT := true + else + TW_INCLUDE_LIBRESETPROP_SOURCE := true + endif +endif + include $(call all-subdir-makefiles) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 1534b5f..fb67f59 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -21,7 +21,7 @@ endif # resetprop include $(CLEAR_VARS) -ifeq ($(TW_INCLUDE_RESETPROP), true) +ifeq ($(TW_INCLUDE_RESETPROP_PREBUILT), true) ifneq (,$(filter $(TARGET_ARCH), x86 x86_64)) RESETPROP_TARGET := resetprop_x86 else diff --git a/resetprop/Android.mk b/resetprop/Android.mk index 9104e4b..053dbfd 100644 --- a/resetprop/Android.mk +++ b/resetprop/Android.mk @@ -1,35 +1,53 @@ LOCAL_PATH := $(call my-dir) +ifneq ($(filter x86_64 arm64,$(TARGET_ARCH)),) + MAGISK_LDFLAGS := -Wl,-dynamic-linker,/sbin/linker64 +else + MAGISK_LDFLAGS := -Wl,-dynamic-linker,/sbin/linker +endif + include $(CLEAR_VARS) -LOCAL_MODULE := resetprop -LOCAL_SHARED_LIBRARIES := libresetprop -LOCAL_C_INCLUDES := \ - $(MAGISK_ROOT_PATH)/include \ - $(LIBUTILS) +ifeq ($(TW_INCLUDE_RESETPROP_SOURCE), true) + LOCAL_MODULE := resetprop + LOCAL_MULTILIB := first + LOCAL_SHARED_LIBRARIES := libresetprop + LOCAL_MODULE_TAGS := eng + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin + LOCAL_C_INCLUDES := \ + $(MAGISK_ROOT_PATH)/include \ + $(LIBUTILS) -LOCAL_SRC_FILES := \ - ../core/applet_stub.cpp + LOCAL_SRC_FILES := \ + ../core/applet_stub.cpp -LOCAL_CFLAGS += $(MAGISK_CFLAGS) -LOCAL_CFLAGS += -DAPPLET_STUB_MAIN=resetprop_main -#LOCAL_LDFLAGS := -static -include $(BUILD_EXECUTABLE) + LOCAL_CFLAGS += $(MAGISK_CFLAGS) + LOCAL_CFLAGS += -DAPPLET_STUB_MAIN=resetprop_main + #LOCAL_LDFLAGS := -static + LOCAL_LDFLAGS := $(MAGISK_LDFLAGS) + include $(BUILD_EXECUTABLE) +endif include $(CLEAR_VARS) -LOCAL_MODULE := libresetprop -LOCAL_STATIC_LIBRARIES := libnanopb libmagisksystemproperties libmagiskutils -LOCAL_SHARED_LIBRARIES := liblog libselinux -LOCAL_C_INCLUDES := \ - $(MAGISK_ROOT_PATH)/include \ - $(LIBNANOPB) \ - $(LIBSYSTEMPROPERTIES) \ - $(LIBUTILS) +ifeq ($(TW_INCLUDE_LIBRESETPROP_SOURCE), true) + LOCAL_MODULE := libresetprop + LOCAL_MULTILIB := first + LOCAL_STATIC_LIBRARIES := libnanopb libmagisksystemproperties libmagiskutils + LOCAL_SHARED_LIBRARIES := liblog libselinux + LOCAL_MODULE_TAGS := eng + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin + LOCAL_C_INCLUDES := \ + $(MAGISK_ROOT_PATH)/include \ + $(LIBNANOPB) \ + $(LIBSYSTEMPROPERTIES) \ + $(LIBUTILS) -LOCAL_SRC_FILES := \ - persist_properties.cpp \ - resetprop.cpp \ - system_property_api.cpp \ - system_property_set.cpp + LOCAL_SRC_FILES := \ + persist_properties.cpp \ + resetprop.cpp \ + system_property_api.cpp \ + system_property_set.cpp -LOCAL_CFLAGS += $(MAGISK_CFLAGS) -include $(BUILD_SHARED_LIBRARY) + LOCAL_CFLAGS += $(MAGISK_CFLAGS) + LOCAL_LDFLAGS := $(MAGISK_LDFLAGS) + include $(BUILD_SHARED_LIBRARY) +endif |