commit 6a1fadea851db236331b3dfe1f3c1e482556057f
author Marco Nelissen Mon Apr 20 16:16:01 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon Apr 20 16:16:01 2009 -0700
tree ec5174266cd02bb0010ca51d687a20ba7d3a3b38
parent e38e90bf222515538281cc73c5e4a9f3c269c875

AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.

Automated import of CL 147028

tools/aapt/Resource.cpp

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index b2bd9ff..2e4d0a4 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -45,13 +45,6 @@
     }
 }
 
-class ResourceTypeSet : public RefBase,
-                        public KeyedVector<String8,sp<AaptGroup> >
-{
-public:
-    ResourceTypeSet();
-};
-
 ResourceTypeSet::ResourceTypeSet()
     :RefBase(),
      KeyedVector<String8,sp<AaptGroup> >()
@@ -1055,6 +1048,7 @@
                 printf("  Writing public definitions to %s.\n", bundle->getPublicOutputFile());
             }
             table.writePublicDefinitions(String16(assets->getPackage()), fp);
+            fclose(fp);
         }
 
         NOISY(
@@ -1072,7 +1066,6 @@
             return err;
         }
     }
-
     return err;
 }