am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp

[android/aapt.git] / Resource.cpp

diff --git a/Resource.cpp b/Resource.cpp
index 1ecf7daef123edad3147a9a5f848bffd1915bdc2..7eaf5280f5d4825d602f30a5bfd67e6591acb4a6 100644 (file)
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -847,8 +847,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
      * request UTF-16 encoding and the parameters of this package
      * allow UTF-8 to be used.
      */
      * request UTF-16 encoding and the parameters of this package
      * allow UTF-8 to be used.
      */

-    if (!bundle->getWantUTF16()
-            && bundle->isMinSdkAtLeast(SDK_FROYO)) {
+    if (!bundle->getUTF16StringsOption()) {

         xmlFlags |= XML_COMPILE_UTF8;
     }
 
         xmlFlags |= XML_COMPILE_UTF8;
     }
 


@@ -1809,7 +1808,7 @@ static status_t writeSymbolClass(
         if (sym.typeCode != AaptSymbolEntry::TYPE_INT32) {
             continue;
         }
         if (sym.typeCode != AaptSymbolEntry::TYPE_INT32) {
             continue;
         }

-        if (!includePrivate && !sym.isPublic) {
+        if (!assets->isJavaSymbol(sym, includePrivate)) {

             continue;
         }
         String16 name(sym.name);
             continue;
         }
         String16 name(sym.name);


@@ -1865,7 +1864,7 @@ static status_t writeSymbolClass(
         if (sym.typeCode != AaptSymbolEntry::TYPE_STRING) {
             continue;
         }
         if (sym.typeCode != AaptSymbolEntry::TYPE_STRING) {
             continue;
         }

-        if (!includePrivate && !sym.isPublic) {
+        if (!assets->isJavaSymbol(sym, includePrivate)) {

             continue;
         }
         String16 name(sym.name);
             continue;
         }
         String16 name(sym.name);


@@ -1977,7 +1976,8 @@ status_t writeResourceSymbols(Bundle* bundle, const sp<AaptAssets>& assets,
         "\n"
         "package %s;\n\n", package.string());
 
         "\n"
         "package %s;\n\n", package.string());
 

-        status_t err = writeSymbolClass(fp, assets, includePrivate, symbols, className, 0, bundle->getNonConstantId());
+        status_t err = writeSymbolClass(fp, assets, includePrivate, symbols,
+                className, 0, bundle->getNonConstantId());

         if (err != NO_ERROR) {
             return err;
         }
         if (err != NO_ERROR) {
             return err;
         }