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 /tools/aapt2/Android.mk | |
| 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 'tools/aapt2/Android.mk')
| -rw-r--r-- | tools/aapt2/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk index 8c128d3ffbb2..d311cd9f0a89 100644 --- a/tools/aapt2/Android.mk +++ b/tools/aapt2/Android.mk @@ -36,6 +36,7 @@ sources := \ Linker.cpp \ Locale.cpp \ Logger.cpp \ + ManifestMerger.cpp \ ManifestParser.cpp \ ManifestValidator.cpp \ Png.cpp \ @@ -65,6 +66,7 @@ testSources := \ JavaClassGenerator_test.cpp \ Linker_test.cpp \ Locale_test.cpp \ + ManifestMerger_test.cpp \ ManifestParser_test.cpp \ Maybe_test.cpp \ NameMangler_test.cpp \ @@ -102,7 +104,7 @@ else endif cFlags := -Wall -Werror -Wno-unused-parameter -UNDEBUG -cppFlags := -std=c++11 -Wno-missing-field-initializers +cppFlags := -std=c++11 -Wno-missing-field-initializers -Wno-unused-private-field # ========================================================== # Build the host static library: libaapt2 |