| commit | 0f3aa1e157af77e544894f8b724b5de01392e0b1 | [log] [tgz] |
|---|---|---|
| author | Dees Troy <dees_troy@teamw.in> | Thu Jan 22 17:56:42 2015 +0100 |
| committer | Gerrit Code Review <gerrit2@gerrit> | Thu Jan 22 17:56:42 2015 +0100 |
| tree | f83513b3deb7dccfe82e172e3eb650bc1505317f | |
| parent | 4f4a7a524a02f711a0f1fa47320ced693363497c [diff] | |
| parent | e176a65e3d335fbec24952ee02726f93692c29eb [diff] |
Merge "Include libpcre if present" into android-5.0
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index e608339..2671e1b 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk
@@ -154,6 +154,9 @@ ifneq ($(TW_RECOVERY_ADDITIONAL_RELINK_FILES),) RELINK_SOURCE_FILES += $(TW_RECOVERY_ADDITIONAL_RELINK_FILES) endif +ifneq ($(wildcard external/pcre/Android.mk),) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpcre.so +endif TWRP_AUTOGEN := $(intermediates)/teamwin