Skip to content

Qingdao #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pengdaozuizuixian wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Qingdao #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6e71c9e
add timezone setting
Jul 13, 2012
6a57eff
Remove flakiness from OldSocketChannelTest#test_socketChannel_read_Di…
enh-google Jul 17, 2012
8399ee3
Remove flakiness from libcore.javax.net.ssl.SSLSessionTest#test_SSLSe…
enh-google Jul 17, 2012
dfe203b
OldDateFormatTest is flaky; improve its output.
enh-google Jul 18, 2012
5525e3d
merge in jb-release history after reset to jb-dev
Jul 19, 2012
b411561
merge in jb-release history after reset to jb-dev
Jul 25, 2012
e533bbf
initial commit of TaintDroid 4.1.1_r6
peterjgilbert Oct 1, 2012
111efc9
cleaning up code
peterjgilbert Oct 2, 2012
6cd6d38
TaintLog: remove non-printable characters
peterjgilbert Oct 2, 2012
56ad3be
make ext4 sdcard behave like fat
peterjgilbert Oct 6, 2012
d7c9493
configure number of data bytes to log for tainted network output in T…
peterjgilbert Oct 25, 2012
ca6dfdb
fixed taint propagation for String.charAt and IntegralToString.conver…
peterjgilbert Nov 14, 2012
54b45b4
propagate taint to file for writes in libcore.io.Posix
peterjgilbert Nov 16, 2012
c403e9d
added Taint.[get/add]TaintShort
peterjgilbert Dec 13, 2012
5120f85
this is a testx
pengdaozuizuixian Feb 2, 2013
6d95486
test
pengdaozuizuixian Feb 2, 2013
f06921f
change libcore write log to write multiple chuinks in hex
pengdaozuizuixian Feb 3, 2013
373cc41
remote test file
pengdaozuizuixian Feb 3, 2013
2a517ed
Merge branch 'taintdroid-4.1.1_r6' of git://github.com/webfiltering/a…
pengdaozuizuixian Feb 3, 2013
b5e3dfa
fix syntax
pengdaozuizuixian Feb 3, 2013
d709ec4
remove test file
pengdaozuizuixian Feb 4, 2013
79219f5
change taint log format to json
pengdaozuizuixian Feb 4, 2013
93e30a9
Move write long function to Taint class and rename it
pengdaozuizuixian Feb 4, 2013
e20cd72
add logic to dump log in hex or not
pengdaozuizuixian Feb 4, 2013
0582aad
replace hexdump code with new one
pengdaozuizuixian Feb 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions JavaLibrary.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ ifeq ($(WITH_HOST_DALVIK),true)
include $(BUILD_HOST_JAVA_LIBRARY)
endif

# turn on taint tracking
ifeq ($(WITH_TAINT_TRACKING),true)
LOCAL_CFLAGS += -DWITH_TAINT_TRACKING
endif

#
# Local droiddoc for faster libcore testing
#
Expand Down
5 changes: 5 additions & 0 deletions NativeCode.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ LOCAL_MODULE := libjavacore
LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
LOCAL_SHARED_LIBRARIES += libstlport

# turn on taint tracking
ifeq ($(WITH_TAINT_TRACKING),true)
LOCAL_CFLAGS += -DWITH_TAINT_TRACKING
endif

include $(BUILD_SHARED_LIBRARY)

#
Expand Down
Loading