| commit | 8a4fe0ddfeed8234cdbe334ccce83f618b4b327a | [log] [tgz] |
|---|---|---|
| author | Maarten Derks <maarten@fairphone.com> | Fri Oct 12 09:16:18 2018 +0200 |
| committer | Maarten Derks <maarten@fairphone.com> | Fri Oct 12 09:16:52 2018 +0200 |
| tree | c3bda4a447b5660118bb8ccbd445bec12bb59745 | |
| parent | dc9d4ebe904141f34f62c8ecef22d0ea38f146a4 [diff] | |
| parent | c0caab559ee0d4eadf57420f04cde28b056a6275 [diff] |
Merge the SuperUser feature branch into int/n/fp2 * origin/dev/n/FP2N-175: su: Introduce conditional for building Issue: FP2N-175 Change-Id: I8481c443ad959abedcd16863764c85e1917d3f10
diff --git a/su/Android.mk b/su/Android.mk index 297e0a3..4130310 100644 --- a/su/Android.mk +++ b/su/Android.mk
@@ -1,3 +1,4 @@ +ifneq ($(FP2_USE_APPOPS_SU),true) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -11,3 +12,4 @@ LOCAL_MODULE_TAGS := debug include $(BUILD_EXECUTABLE) +endif