diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-09-15 16:57:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-15 16:57:21 +0000 |
| commit | e33de76a16f6acc42858766460976f44e629657d (patch) | |
| tree | ce962def3f718730407e6863a14aaf0df9a66787 /tools/aapt2/Resource.cpp | |
| parent | d2d6c257f141ed38da2cf0d0a2f84c6f7f055e92 (diff) | |
| parent | e02983681ae85212c2263055fd4bcfd8097f19bc (diff) | |
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev
am: e02983681a
Change-Id: I42369e6fb7bd121e45b5a002cd5f00e05221ead3
Diffstat (limited to 'tools/aapt2/Resource.cpp')
| -rw-r--r-- | tools/aapt2/Resource.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/aapt2/Resource.cpp b/tools/aapt2/Resource.cpp index 35971e7bd99b..a9f5f298e019 100644 --- a/tools/aapt2/Resource.cpp +++ b/tools/aapt2/Resource.cpp @@ -61,6 +61,8 @@ StringPiece ToString(ResourceType type) { return "menu"; case ResourceType::kMipmap: return "mipmap"; + case ResourceType::kNavigation: + return "navigation"; case ResourceType::kPlurals: return "plurals"; case ResourceType::kRaw: @@ -98,6 +100,7 @@ static const std::map<StringPiece, ResourceType> sResourceTypeMap{ {"layout", ResourceType::kLayout}, {"menu", ResourceType::kMenu}, {"mipmap", ResourceType::kMipmap}, + {"navigation", ResourceType::kNavigation}, {"plurals", ResourceType::kPlurals}, {"raw", ResourceType::kRaw}, {"string", ResourceType::kString}, |