OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
63cd28a
)
Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)
author
Yusuke Sato
<yusukes@google.com>
Wed, 5 Aug 2015 20:14:53 +0000
(13:14 -0700)
committer
Yusuke Sato
<yusukes@google.com>
Wed, 5 Aug 2015 21:41:52 +0000
(14:41 -0700)
Change-Id: Icea0ac00c56b5c8aa21134fc49b518cda4759e36
libs/androidfw/ZipFileRO.cpp
patch
|
blob
|
history
diff --git
a/libs/androidfw/ZipFileRO.cpp
b/libs/androidfw/ZipFileRO.cpp
index
96eb649
..
49fe8a2
100644
(file)
--- a/
libs/androidfw/ZipFileRO.cpp
+++ b/
libs/androidfw/ZipFileRO.cpp
@@
-132,11
+132,6
@@
bool ZipFileRO::startIteration(void** cookie) {
bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix)
{
- return startIteration(cookie, NULL, NULL);
-}
-
-bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix)
-{
_ZipEntryRO* ze = new _ZipEntryRO;
ZipString pe(prefix ? prefix : "");
ZipString se(suffix ? suffix : "");