diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-03 00:39:55 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-06 01:58:53 +0000 |
| commit | 5531b23c1546fdf896db25f7412291bada6e723c (patch) | |
| tree | 5b665c603526fd25e5a7d59827dc815e128b2939 /libdex/OptInvocation.cpp | |
| parent | 9003fb0f7b8a0c9375e9096871d081ada497859d (diff) | |
Unbreak building host modules
bionic is now a dependency for properties
Change-Id: Icd406e639ca297244ab809f523c6830c2240d20b
Diffstat (limited to 'libdex/OptInvocation.cpp')
| -rw-r--r-- | libdex/OptInvocation.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libdex/OptInvocation.cpp b/libdex/OptInvocation.cpp index 77a72b34e..ad69a9efa 100644 --- a/libdex/OptInvocation.cpp +++ b/libdex/OptInvocation.cpp @@ -32,7 +32,9 @@ #include "OptInvocation.h" #include "DexFile.h" +#ifdef ALLOW_DEXROOT_ON_CACHE #include <cutils/properties.h> +#endif static const char* kCacheDirectoryName = "dalvik-cache"; static const char* kClassesDex = "classes.dex"; @@ -56,7 +58,9 @@ char* dexOptGenerateCacheFileName(const char* fileName, const char* subFileName) const char* cacheRoot; const char* systemRoot; char* cp; +#ifdef ALLOW_DEXROOT_ON_CACHE char dexoptDataOnly[PROPERTY_VALUE_MAX]; +#endif /* * Get the absolute path of the Jar or DEX file. @@ -115,7 +119,9 @@ char* dexOptGenerateCacheFileName(const char* fileName, const char* subFileName) if (systemRoot == NULL) systemRoot = "/system"; +#ifdef ALLOW_DEXROOT_ON_CACHE if (dexRoot == NULL) +#endif dexRoot = dataRoot; #ifdef ALLOW_DEXROOT_ON_CACHE |