summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-11-14 14:48:12 -0800
committerAdam Lesinski <adamlesinski@google.com>2015-04-02 17:02:48 -0700
commit6f6ceb7e1456698b1f33e04536bfb3227f9fcfcb (patch)
tree0a1f8e354c4714f162f849b09a5d5da757c6d5b8 /include
parent041ca26d028ae314d416cb107721ea7267af6aca (diff)
downloadframeworks_base-6f6ceb7e1456698b1f33e04536bfb3227f9fcfcb.zip
frameworks_base-6f6ceb7e1456698b1f33e04536bfb3227f9fcfcb.tar.gz
frameworks_base-6f6ceb7e1456698b1f33e04536bfb3227f9fcfcb.tar.bz2
AAPT2
First checking of AAPT2. The individual phases of AAPT2 work, but there are some missing pieces. For early testing we are missing: - Need to properly mark file references and include them in package - Need to package into zip Final AAPT for apps we are missing: - Need to crush PNGs - Need to parse 9-patches - Need to validate all of AndroidManifest.xml - Need to write align method to align resource tables for splits. Final AAPT for apps + system we are missing: - Need to handle overlays - Need to store comments for R file - Need to handle --shared-lib (dynamic references too). New AAPT features coming: - Need to import compiled libraries - Name mangling - R file generation for library code Change-Id: I95f8a63581b81a1f424ae6fb2c373c883b72c18d
Diffstat (limited to 'include')
-rw-r--r--include/androidfw/ResourceTypes.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
index 65160d5..a5776a4 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -1333,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;