Skip to content

Commit

Permalink
Merge remote-tracking branch 'tance/terminal-support' into cm-11.0
Browse files Browse the repository at this point in the history 
Conflicts:
	Superuser/jni/su/daemon.c

Change-Id: I2739f6bcbed03636d7a2fb66377977cd16999926
  • Loading branch information
@koush
koush committed Jan 12, 2014
2 parents 8516028 + 8881f70 commit b31c141
Show file tree
Hide file tree
Showing 4 changed files with 759 additions and 205 deletions.
2 changes: 1 addition & 1 deletion Superuser/jni/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
Loading

1 comment on commit b31c141

@grondinm
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.