Permalink
Browse files

Merge remote-tracking branch 'tance/terminal-support' into cm-11.0

Conflicts:
	Superuser/jni/su/daemon.c

Change-Id: I2739f6bcbed03636d7a2fb66377977cd16999926
  • Loading branch information...
koush committed Jan 12, 2014
2 parents 8516028 + 8881f70 commit b31c141651623af3d823b92c53e4347d132da9b9
Showing with 759 additions and 205 deletions.
  1. +1 −1 Superuser/jni/Android.mk
  2. +308 −204 Superuser/jni/su/daemon.c
  3. +334 −0 Superuser/jni/su/pts.c
  4. +116 −0 Superuser/jni/su/pts.h
View
@@ -6,7 +6,7 @@ LOCAL_MODULE := su
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_STATIC_LIBRARIES := sqlite3 libcutils libc
LOCAL_C_INCLUDES := $(LOCAL_PATH)/sqlite3
LOCAL_SRC_FILES := su/su.c su/activity.c su/db.c su/utils.c su/daemon.c
LOCAL_SRC_FILES := su/su.c su/activity.c su/db.c su/utils.c su/daemon.c su/pts.c
include $(BUILD_EXECUTABLE)
Oops, something went wrong.

1 comment on commit b31c141

@grondinm

This comment has been minimized.

Show comment
Hide comment
@grondinm

grondinm Jan 12, 2014

So i did not want to create an issue on here incase it's something on my side but after this commit CM-11 build is broken:
http://pastebin.com/Fc1Pm352

EDIT:Nevermind i noticed this was fixed in CM source while it was building.

grondinm commented on b31c141 Jan 12, 2014

So i did not want to create an issue on here incase it's something on my side but after this commit CM-11 build is broken:
http://pastebin.com/Fc1Pm352

EDIT:Nevermind i noticed this was fixed in CM source while it was building.

Please sign in to comment.