Adam Lesinski
8197cc460e
AAPT2: Merge Styleables instead of overriding them
...
Styleables merge in AAPT. Preserve this behavior.
Bug:30970091
Change-Id: Ie68ca675aeecd873c0648682182e2fc574e329a0
2016-08-19 13:29:40 -07:00
Adam Lesinski
aa0255da28
AAPT2: Add tool to fix positional argument issues
...
Change-Id: Ie8f733b70d561667cd25b38fb4c09d0837ef9b7f
2016-08-18 14:05:44 -07:00
Alexandria Cornwall
6de29ed5b4
Merge "AAPT2: Add support to strip namespaces from XML"
2016-08-17 19:57:12 +00:00
Alexandria Cornwall
a7cc3f1d79
AAPT2: Add support to strip namespaces from XML
...
The --no-xml-namespaces flag will strip namespace information from
compiled binary XML files in res/* (excluding res/raw/*) and
AndroidManifest.xml. It will also strip URI information from compiled
binary XML files in res/* (excluding res/raw/* and AndroidManifest.xml).
AndroidManifest.xml URI information is retained due to PackageParser, which
requires the Android URI for intent filters.
Bug: 29115919
Change-Id: I90cad6ed39ce02a69776f55314c1d4f38ad1aabe
2016-08-17 11:01:05 -07:00
Adam Lesinski
84ae78b109
Merge "AAPT: Handle gaps in resources when building splits"
2016-08-17 00:03:36 +00:00
Chih-Hung Hsieh
c37e88100d
Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3 am: 9c0b881c9d am: 1ab51f3769
...
am: bd070b7792
2016-08-16 02:48:15 +00:00
Chih-Hung Hsieh
bd070b7792
Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3 am: 9c0b881c9d
...
am: 1ab51f3769
2016-08-16 02:39:40 +00:00
Chih-Hung Hsieh
1ab51f3769
Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3
...
am: 9c0b881c9d
2016-08-16 02:31:42 +00:00
Chih-Hung Hsieh
9c0b881c9d
Merge "Fix google-explicit-constructor warnings."
...
am: ea537bf5b3
2016-08-16 02:23:48 +00:00
Treehugger Robot
ea537bf5b3
Merge "Fix google-explicit-constructor warnings."
2016-08-16 02:12:39 +00:00
Adam Lesinski
081d1b4cf6
AAPT: Handle gaps in resources when building splits
...
Due to public ID assignment, gaps in resource type and entry
IDs can occur. This can lead to null pointer dereferencing
if not careful. This happened in ResourceTable::getDensityVaryingResources()
which is called when building Splits.
Bug:30879690
Change-Id: I588e4dcd2e042fccfcb2e87967b5cbd0d23b4497
2016-08-15 18:45:00 -07:00
Adam Lesinski
00e7ebbe1a
AAPT: Fix use-after-free error am: 193ed74c2d am: 646f2d9c33
...
am: 9e8da4a476
2016-08-15 23:33:01 +00:00
Adam Lesinski
9e8da4a476
AAPT: Fix use-after-free error am: 193ed74c2d
...
am: 646f2d9c33
2016-08-15 23:22:04 +00:00
Chih-Hung Hsieh
21c0f29597
Fix google-explicit-constructor warnings.
...
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1
Change-Id: I7422d703de17c4266d2a022990d0e1df40f48226
2016-08-15 14:45:02 -07:00
Adam Lesinski
193ed74c2d
AAPT: Fix use-after-free error
...
Re-order deletion of ResXMLTree and the Asset object
it iterates over.
Bug:30844391
Change-Id: Ied033d0a8f93343006228a2054c6d0f42bb4717a
2016-08-15 14:22:36 -07:00
TreeHugger Robot
e42bc0587f
Merge "Fix clang-tidy warnings in aapt and aapt2."
2016-08-15 21:10:23 +00:00
TreeHugger Robot
1d740812e6
Merge "AAPT2: Expose split support to command line"
2016-08-15 20:46:38 +00:00
Chih-Hung Hsieh
470f8fcb5c
Fix clang-tidy warnings in aapt and aapt2.
...
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Add NOLINT to suppress wrong clang-tidy warnings on macros.
Test: build with WITH_TIDY=1
Change-Id: Ibfafb23d9be463b4072745a51a6d9f1812dcac45
2016-08-15 12:32:51 -07:00
Adam Lesinski
36c73a5959
AAPT2: Expose split support to command line
...
Bug:30445078
Change-Id: If4b8530dba71b9059b8e62c04757da99c1119d22
2016-08-15 12:14:26 -07:00
Chih-Hung Hsieh
84717d4118
resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3
...
am: c76aa69207
2016-08-12 19:35:08 +00:00
Chih-Hung Hsieh
c76aa69207
resolve merge conflicts of 17bd236 to stage-aosp-master
...
am: b3d46b44a3
2016-08-12 19:30:02 +00:00
Alexandria Cornwall
c34027ec3d
Merge "AAPT2: Fix resource type id symbol merging"
2016-08-12 19:27:32 +00:00
Chih-Hung Hsieh
b3d46b44a3
resolve merge conflicts of 17bd236 to stage-aosp-master
...
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
2016-08-12 11:44:16 -07:00
Chih-Hung Hsieh
56996ff61e
resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4
...
am: ef57a0d629
2016-08-12 00:40:25 +00:00
Chih-Hung Hsieh
ef57a0d629
resolve merge conflicts of 76ce8e5 to stage-aosp-master
...
am: ed935c32f4
2016-08-12 00:31:29 +00:00
Chih-Hung Hsieh
ed935c32f4
resolve merge conflicts of 76ce8e5 to stage-aosp-master
...
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
2016-08-11 16:48:46 -07:00
Treehugger Robot
76ce8e5242
Merge "Fix clang-tidy warnings in libs/hwui."
2016-08-11 23:20:47 +00:00
Chih-Hung Hsieh
8bd37ba458
Fix clang-tidy warnings in aapt and aapt2.
...
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1
Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Merged-In: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
2016-08-11 15:20:10 -07:00
Chih-Hung Hsieh
9b8528fee4
Fix clang-tidy warnings in aapt and aapt2.
...
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1
Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
2016-08-11 15:16:41 -07:00
Alexandria Cornwall
6a1f8dbd51
AAPT2: Fix resource type id symbol merging
...
By the looks of things, AAPT2 should be able to merge public type and entry
symbols iff their types and resource IDs match.
Change-Id: Ie99071418aa89aad56de5e5b96e98b96d0d15d7a
2016-08-11 14:46:27 -07:00
Alexandria Cornwall
8eefa04826
Merge "AAPT2: Reorder link steps"
2016-08-11 18:33:02 +00:00
Hans Boehm
17874c98ee
Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340 am: c97c9dbd96 am: a33407d2f8
...
am: 53511e1196
2016-08-11 17:45:24 +00:00
Hans Boehm
53511e1196
Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340 am: c97c9dbd96
...
am: a33407d2f8
2016-08-11 17:39:16 +00:00
Hans Boehm
a33407d2f8
Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340
...
am: c97c9dbd96
2016-08-11 17:32:34 +00:00
Hans Boehm
c97c9dbd96
Merge "Do not stack allocate RefBase object in AaptAssets::filter"
...
am: d0197ac340
2016-08-11 17:28:07 +00:00
Alexandria Cornwall
637b4820dc
AAPT2: Reorder link steps
...
AAPT2's link steps were writing the res/* files before optimizations to the
resource table were performed (such as version collapsing). This was causing
unreferenced res/* files to remain in the archive, even though they're no
longer necessary.
Bug: 30705740
Change-Id: I50d7943ef7429b14e46587093855c15d54038299
2016-08-11 09:53:16 -07:00
Hans Boehm
25dfa75ee3
Do not stack allocate RefBase object in AaptAssets::filter
...
Doing so is likely to trigger log messages in the future, and will
hinder diagnosis of other problems.
Bug: 30292538
Change-Id: I2cb8c507e43d06d4afa7e35b564416c1474c81d1
2016-08-10 19:56:50 -07:00
Chih-Hung Hsieh
f35c939cd7
Fix clang-tidy warnings in libs/hwui.
...
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
Test: build with WITH_TIDY=1
Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Merged-In: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
2016-08-10 23:26:59 +00:00
Chih-Hung Hsieh
49796451cb
Fix clang-tidy warnings in libs/hwui.
...
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
Test: build with WITH_TIDY=1
Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
2016-08-10 16:01:29 -07:00
TreeHugger Robot
b80b6dabcb
Merge "AAPT2: Parse coreApp in <manifest> as boolean"
2016-08-10 19:52:24 +00:00
Adam Lesinski
6b17d2cec2
AAPT2: Parse coreApp in <manifest> as boolean
...
Bug:30751662
Change-Id: I283be5725426ee084944c1921df40d1bd6188028
2016-08-10 11:37:06 -07:00
Raph Levien
6e8ea4373b
Merge "Update lint check to accommodate new emoji sequences"
2016-08-09 23:42:16 +00:00
Raph Levien
2b8b819fee
Update lint check to accommodate new emoji sequences
...
These are not yet ready for updating in the unicode data, so we patch
them in code until they are.
Bug: 30594617
Change-Id: Ib4c8568aa4840341474eb0c0c95674d640473f4d
2016-08-09 14:28:54 -07:00
Alexandria Cornwall
f6762fc22a
AAPT2: Merge binary XML file attributes
...
AAPT2 generates extra versions of XML binaries based on the sdkVersion
that attributes were introduced, up to v21. This should only happen for
sdkVersions that are > minSdkVersion, as everything else can be included
in the main configuration (e.g. "layout" instead of "layout-v4").
This change handles the merging of XML binary sdkVersions that were created
implicitly.
Bug: 30705740
Change-Id: I854843dd6dbaca52896cea0c24c70c900cec3e8e
2016-08-09 13:23:03 -07:00
Evan Rosky
8875c52bd5
Merge "Fix build breakage caused by incomplete impl"
2016-08-09 00:12:50 +00:00
Evan Rosky
96057330b3
Fix build breakage caused by incomplete impl
...
Change-Id: I32a8e0e5cb5209133e00dbc0589bc8b87f46260b
2016-08-08 17:10:04 -07:00
Adam Lesinski
9756dec248
AAPT2: Add default no-compress extensions
...
Change-Id: Iff0820993059bcab59208b07601b2c6d8d953c89
2016-08-08 12:41:45 -07:00
Diego Perez
cf2d88a65d
Merge "Remove deprecated overriden methods in CreateInfo"
2016-08-04 16:55:07 +00:00
Diego Perez
d07aa25398
Merge "Implement missing getAssignedPackageIdentifiers delegate"
2016-08-04 16:54:13 +00:00
Adam Lesinski
4c93815736
AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938
...
am: 84877752ee
2016-08-04 02:12:35 +00:00
