1 files changed, 11 insertions, 0 deletions
diff --git a/tools/aapt/AaptConfig.cpp b/tools/aapt/AaptConfig.cpp
index b12867a..fc42b8c 100644
--- a/tools/aapt/AaptConfig.cpp
+++ b/tools/aapt/AaptConfig.cpp
@@ -224,9 +224,20 @@ bool parse(const String8& str, ConfigDescription* out) {
 
 success:
     if (out != NULL) {
+#ifndef HAVE_ANDROID_OS
         applyVersionForCompatibility(&config);
+#else
+        // Calling applyVersionForCompatibility when compiling a theme can cause
+        // the path to be changed by AAPT which results in the themed assets not being
+        // loaded.  The only time (as of right now) that aapt is run on an android device
+        // is when it is being used for themes, so this should be the correct behavior
+        // in this case.  If AAPT is ever used on an android device for some other reason,
+        // we will need to change this.
+        printf("AAPT is running on Android, skipping applyVersionForCompatibility");
+#endif
         *out = config;
     }
+
     return true;
 }