OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
49bfda1
d4dabf8
)
am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
author
Mark Salyzyn
<salyzyn@google.com>
Thu, 13 Mar 2014 23:12:09 +0000
(23:12 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 13 Mar 2014 23:12:09 +0000
(23:12 +0000)
* commit '
d4dabf872ac0a12e12aebae9032f7d62762c2aeb
':
native frameworks: 64-bit compile issues
1
2
cmds/flatland/Main.cpp
patch
|
diff1
|
diff2
|
blob
|
history
libs/ui/Region.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/sensorservice/SensorService.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/surfaceflinger/DisplayHardware/HWComposer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cmds/flatland/Main.cpp
Simple merge
diff --cc
libs/ui/Region.cpp
Simple merge
diff --cc
services/sensorservice/SensorService.cpp
Simple merge
diff --cc
services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
Simple merge
diff --cc
services/surfaceflinger/DisplayHardware/HWComposer.cpp
index
0ca93c8
,
a48582e
..
a6f8d15
---
1
/
services/surfaceflinger/DisplayHardware/HWComposer.cpp
---
2
/
services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/
services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@@
-21,11
-23,10
+23,10
@@@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
- #include <math.h>
-#include <utils/CallStack.h>
#include <utils/Errors.h>
#include <utils/misc.h>
+#include <utils/NativeHandle.h>
#include <utils/String8.h>
#include <utils/Thread.h>
#include <utils/Trace.h>