| 981de838d4d352ef32de5ae69c58f2ae04fd39ed |
|
16-Mar-2017 |
Adam Lesinski <adamlesinski@google.com> |
Add LOCAL_ASSET_DIR support (-A) to aapt2
Although performing the inclusion of assets/ at a later stage is
preferable, (since aapt just copies the files) do the easy thing and
support what aapt did. In the future perhaps we can zip up the
assets/ directories when also merging in the classes.dex.
Bug: 35461578
Change-Id: I7d7fde43333ea6455c4a1b9113bd25e1d88b7dd5
Test: manual
/build/make/core/aapt2.mk
|
| 79326762158236f09c844d5ce241f4d93bfa2ca4 |
|
15-Mar-2017 |
Adam Lesinski <adamlesinski@google.com> |
Revert "Add LOCAL_ASSET_DIR support (-A) to aapt2"
This reverts commit 996bc3ce7b3d41982982c16ebe1afc7e387f7333.
Reason for revert: Need to update prebuilts, but prebuilts not built by server yet...
Change-Id: I87deb3ed9512278ff40c185059230dbd66524989
/build/make/core/aapt2.mk
|
| 996bc3ce7b3d41982982c16ebe1afc7e387f7333 |
|
14-Mar-2017 |
Adam Lesinski <adamlesinski@google.com> |
Add LOCAL_ASSET_DIR support (-A) to aapt2
Although performing the inclusion of assets/ at a later stage is
preferable, (since aapt just copies the files) do the easy thing and
support what aapt did. In the future perhaps we can zip up the
assets/ directories when also merging in the classes.dex.
Bug: 35461578
Test: manual
Change-Id: I7cd36585e7c292e43b5528969900c6ead2b80c0b
/build/make/core/aapt2.mk
|
| 4c45205c99cac8da8bb03bf6c2bf92720ebde347 |
|
12-Aug-2016 |
Adam Lesinski <adamlesinski@google.com> |
Add split support for AAPT2
AAPT2 allows the declaration of a split path, so that build systems
don't need to guess the auto-generated name.
Construct the split path we want from the configurations passed in to
LOCAL_PACKAGE_SPLITS.
Bug:30445078
Change-Id: I06a4148b283d0c6751751ba116e9482c3a6eae5d
/build/make/core/aapt2.mk
|
| 75e962a87ed47715ca607e6e403365ff58f7f288 |
|
03-Mar-2016 |
Ying Wang <wangying@google.com> |
Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES
Bug: 25958912
Change-Id: Iafba9eefde0823095775474bcb7cc5b6c21fd248
/build/make/core/aapt2.mk
|
| e758f9319dcb6cc9693af03cc03d385167a35a8d |
|
26-Feb-2016 |
Adam Lesinski <adamlesinski@google.com> |
AAPT2: Enable product/config filtering and improve source ordering
- Restore old ordering of resource files to match AAPT behavior
- Change the order in which overlays are processed.
Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
/build/make/core/aapt2.mk
|
| e295c3df68c4011cfda4696e4e02c12feba868c0 |
|
24-Feb-2016 |
Ying Wang <wangying@google.com> |
AAPT2: library resource compilation
- Switch to static library's package-res.apk as the link artifact.
- For prebuilt AAR file, build package-res.apk using aapt2's "--dir"
option.
- New LOCAL variables:
LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true".
LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled
resources.
LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled
resources.
Bug: 25958912
Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
/build/make/core/aapt2.mk
|
| 497888de8c798463c076645e4b6bff81aab4bfc7 |
|
26-Jan-2016 |
Adam Lesinski <adamlesinski@google.com> |
Use --pseudo-localize only with compile phase in AAPT2
AAPT2 does pseudo-localization in compile phase. Passing --pseudo-localize
to the link phase causes an error.
Bug:25958912
Change-Id: I6ced0979884cb0d718018f995f9b2f6476d401cb
/build/make/core/aapt2.mk
|
| dd71c85a452af4269c947797b68027c2d663d4ef |
|
04-Dec-2015 |
Ying Wang <wangying@google.com> |
Support to build with AAPT2
To build with AAPT2, set "USE_AAPT2=true".
TODO: Support split apks and generated resources from other than renderscript.
Bug: 25958912
Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
/build/make/core/aapt2.mk
|