diff options
author | Adam Lesinski <adamlesinski@google.com> | 2015-05-20 15:24:01 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2015-06-04 18:00:33 -0700 |
commit | 8c831ca87bb7c8699b2a5cb34b8d35deedf9ce4e (patch) | |
tree | 454f5342f3634e3cb2ea858fcf6226ec3b133911 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 581cc1ee59d01fe4b4a31618ab4aedfa639e42b0 (diff) |
AAPT2: Add manifest merging
Now that AAPT2 is library-aware, it needs to take care of
all library related work, including merging manifests.
The logic was taken from the current Java ManifestMerger.
Change-Id: Id93f713f27ae8617922bf89e325e45be9f863c06
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions