Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
98177f01f7ff5253e42c6f7f50a9aaba16ab90f2
/
tools
/
aapt2
/
link
/
TableMerger.cpp
f42c866
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev
by Adam Lesinski
· 7 years ago
5924d8c
AAPT2: Allow merging of Style attributes from overlays
by Adam Lesinski
· 7 years ago
4488f1c
AAPT2: Fix <add-resource> tag for overlays
by Adam Lesinski
· 7 years ago
b5dc4bd
AAPT2: Few tweaks to get shared-libraries working
by Adam Lesinski
· 8 years ago
d5083f6
Move StringPiece to libandroidfw
by Adam Lesinski
· 8 years ago
ce5e56e
AAPT2: Rename to match new style
by Adam Lesinski
· 8 years ago
cacb28f
Use Google3 style guide with .clang-format
by Adam Lesinski
· 8 years ago
085f495
AAPT2: Revert warning when merging packages
by Adam Lesinski
· 8 years ago
5c3464c
AAPT2: Fix merging of styleables the right way
by Adam Lesinski
· 8 years ago
c34027e
Merge "AAPT2: Fix resource type id symbol merging"
by Alexandria Cornwall
· 8 years ago
9b8528f
Fix clang-tidy warnings in aapt and aapt2.
by Chih-Hung Hsieh
· 8 years ago
6a1f8db
AAPT2: Fix resource type id symbol merging
by Alexandria Cornwall
· 8 years ago
d0f116b
AAPT2: Remove usage of u16string
by Adam Lesinski
· 8 years ago
64587af
AAPT2: Support building, linking, and merging static libraries
by Adam Lesinski
· 9 years ago
355f285
AAPT2: Implement density stripping and initial Split support
by Adam Lesinski
· 9 years ago
e4bb9eb
AAPT2: Introduce notion of 'product' to ResourceTable
by Adam Lesinski
· 9 years ago
6a00817
AAPT2: Support -c configuration filtering
by Adam Lesinski
· 9 years ago
a6fe345
AAPT2: Fix overlay support
by Adam Lesinski
· 9 years ago
fb48d29
AAPT2: Add support for overlays when merging resources
by Adam Lesinski
· 9 years ago
83f2255
AAPT2: Disambiguate merging of resources
by Adam Lesinski
· 9 years ago
b274e35
AAPT2: Fix inclusion of comments in R.java javadoc
by Adam Lesinski
· 9 years ago
e78fd61
AAPT2: Move comments and source into Value
by Adam Lesinski
· 9 years ago
9e10ac7
AAPT2: Process <java-symbols> and private symbol package
by Adam Lesinski
· 9 years ago
9ba47d8
Filter products during compile phase
by Adam Lesinski
· 9 years ago
1ab598f
AAPT2: Separate out the various steps
by Adam Lesinski
· 9 years ago