diff options
Diffstat (limited to 'include/androidfw')
| -rw-r--r-- | include/androidfw/BackupHelpers.h | 5 | ||||
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/include/androidfw/BackupHelpers.h b/include/androidfw/BackupHelpers.h index 0841af6..fc1ad47 100644 --- a/include/androidfw/BackupHelpers.h +++ b/include/androidfw/BackupHelpers.h @@ -17,6 +17,8 @@ #ifndef _UTILS_BACKUP_HELPERS_H #define _UTILS_BACKUP_HELPERS_H +#include <sys/stat.h> + #include <utils/Errors.h> #include <utils/String8.h> #include <utils/KeyedVector.h> @@ -135,7 +137,8 @@ int back_up_files(int oldSnapshotFD, BackupDataWriter* dataStream, int newSnapsh char const* const* files, char const* const *keys, int fileCount); int write_tarfile(const String8& packageName, const String8& domain, - const String8& rootPath, const String8& filePath, BackupDataWriter* outputStream); + const String8& rootPath, const String8& filePath, off_t* outSize, + BackupDataWriter* outputStream); class RestoreHelperBase { diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 0822afd..da70e9b 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1195,6 +1195,12 @@ struct ResTable_config // Example: en-US, en-Latn-US, en-POSIX. void getBcp47Locale(char* out) const; + // Append to str the resource-qualifer string representation of the + // locale component of this Config. If the locale is only country + // and language, it will look like en-rUS. If it has scripts and + // variants, it will be a modified bcp47 tag: b+en+Latn+US. + void appendDirLocale(String8& str) const; + // Sets the values of language, region, script and variant to the // well formed BCP-47 locale contained in |in|. The input locale is // assumed to be valid and no validation is performed. @@ -1327,7 +1333,11 @@ struct ResTable_entry FLAG_COMPLEX = 0x0001, // If set, this resource has been declared public, so libraries // are allowed to reference it. - FLAG_PUBLIC = 0x0002 + FLAG_PUBLIC = 0x0002, + // If set, this is a weak resource and may be overriden by strong + // resources of the same name/type. This is only useful during + // linking with other resource tables. + FLAG_WEAK = 0x0004 }; uint16_t flags; |