Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

79758c8e

Commit 79758c8e authored 8 years ago by Adam Lesinski Committed by Android (Google) Code Review 8 years ago

Downloads
- Plain Diff

Merge "AAPT2: Fix merging of styleables the right way"

parents a08ca06b 5c3464c7

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

tools/aapt2/ResourceTable.cpp 24 additions, 31 deletions

tools/aapt2/ResourceTable.cpp
tools/aapt2/ResourceTable.h 11 additions, 6 deletions

tools/aapt2/ResourceTable.h
tools/aapt2/ResourceTable_test.cpp 0 additions, 33 deletions

tools/aapt2/ResourceTable_test.cpp
tools/aapt2/ResourceValues.cpp 14 additions, 3 deletions

tools/aapt2/ResourceValues.cpp
tools/aapt2/ResourceValues.h 1 addition, 0 deletions

tools/aapt2/ResourceValues.h
tools/aapt2/flatten/TableFlattener.cpp 3 additions, 3 deletions

tools/aapt2/flatten/TableFlattener.cpp
tools/aapt2/integration-tests/AppOne/res/values/test.xml 7 additions, 0 deletions

tools/aapt2/integration-tests/AppOne/res/values/test.xml
tools/aapt2/integration-tests/StaticLibOne/res/values/values.xml 1 addition, 0 deletions

...apt2/integration-tests/StaticLibOne/res/values/values.xml
tools/aapt2/link/TableMerger.cpp 172 additions, 117 deletions

tools/aapt2/link/TableMerger.cpp
tools/aapt2/link/TableMerger_test.cpp 39 additions, 0 deletions

tools/aapt2/link/TableMerger_test.cpp

with 272 additions and 193 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment