summaryrefslogtreecommitdiffstats
path: root/tools/obbtool
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-08-17 23:52:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-17 23:52:36 +0000
commitfac7ade02efc74dda0992ccf32cc24ceaa4a5806 (patch)
treedf3d276e0ba502187b10d4bb3ed0265d8085ba43 /tools/obbtool
parent2c8a41fba52440909335ad41dcab4a6e7fbc67e1 (diff)
parentd2febbbd4ac09c3aa0d36e16e44e4a24a731057c (diff)
downloadframeworks_base-fac7ade02efc74dda0992ccf32cc24ceaa4a5806.zip
frameworks_base-fac7ade02efc74dda0992ccf32cc24ceaa4a5806.tar.gz
frameworks_base-fac7ade02efc74dda0992ccf32cc24ceaa4a5806.tar.bz2
am f71a2835: Merge "PackageInfo is a class, not a struct" into lmp-dev-plus-aosp
* commit 'f71a28354cf3339a744b4abb9571fe98f7bad4ee': PackageInfo is a class, not a struct
Diffstat (limited to 'tools/obbtool')
-rw-r--r--tools/obbtool/Main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/obbtool/Main.cpp b/tools/obbtool/Main.cpp
index b2152e8..64808c0 100644
--- a/tools/obbtool/Main.cpp
+++ b/tools/obbtool/Main.cpp
@@ -89,7 +89,7 @@ void usage(void)
" Prints the OBB signature information of a file.\n\n", gProgName);
}
-void doAdd(const char* filename, struct PackageInfo* info) {
+void doAdd(const char* filename, PackageInfo* info) {
ObbFile *obb = new ObbFile();
if (obb->readFrom(filename)) {
fprintf(stderr, "ERROR: %s: OBB signature already present\n", filename);
@@ -182,7 +182,7 @@ int main(int argc, char* const argv[])
{
int opt;
int option_index = 0;
- struct PackageInfo package_info;
+ PackageInfo package_info;
int result = 1; // pessimistically assume an error.