diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-05-13 21:40:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 21:40:24 +0000 |
| commit | 68727a0b2074d6a9c03cff967c28da069deedae3 (patch) | |
| tree | f2558ec45f0362bad618c28345648e64a0ceeccf /tools/aapt2/Main.cpp | |
| parent | 79e04686f6b57ce3a5adf415212c592ad4c6d605 (diff) | |
| parent | bdaa092a193d8ddccbd9ad8434be97878e6ded59 (diff) | |
| download | frameworks_base-68727a0b2074d6a9c03cff967c28da069deedae3.zip frameworks_base-68727a0b2074d6a9c03cff967c28da069deedae3.tar.gz frameworks_base-68727a0b2074d6a9c03cff967c28da069deedae3.tar.bz2 | |
Merge "AAPT2: inferred style parent processing" into mnc-dev
Diffstat (limited to 'tools/aapt2/Main.cpp')
| -rw-r--r-- | tools/aapt2/Main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp index f1b7777..e0977b8 100644 --- a/tools/aapt2/Main.cpp +++ b/tools/aapt2/Main.cpp @@ -158,7 +158,6 @@ void versionStylesForCompat(const std::shared_ptr<ResourceTable>& table) { }; Style& newStyle = static_cast<Style&>(*value.value); - newStyle.weak = true; // Move the recorded stripped attributes into this new style. std::move(stripped.begin(), stripped.end(), |