diff options
| author | 2023-08-31 10:47:20 +0000 | |
|---|---|---|
| committer | 2023-08-31 18:29:49 +0000 | |
| commit | cbb5520bc8556c9f4e477513cb157f717254ceb2 (patch) | |
| tree | 1a6bf50be795a191e9477a2545d607ff954d3b08 /tools/aapt/Command.cpp | |
| parent | cce004cc51e6df6724c0e34aab192e0b1fa86864 (diff) | |
| parent | e5ee511172be798f860ea7a61858037f75903d36 (diff) | |
[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce9592378 am: e5ee511172
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725659
Change-Id: I177a7b051ecd418cc07b3026ae4100cac271408e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I1900f2285ee3c3b1eb57d2cef3990896a64dae01
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 5a06b102592a..60f3f2715395 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -1133,7 +1133,7 @@ int doDump(Bundle* bundle) if (code == ResXMLTree::END_TAG) { depth--; if (depth < 2) { - if (withinSupportsInput && !supportedInput.isEmpty()) { + if (withinSupportsInput && !supportedInput.empty()) { printf("supports-input: '"); const size_t N = supportedInput.size(); for (size_t i=0; i<N; i++) { @@ -1300,7 +1300,7 @@ int doDump(Bundle* bundle) ResTable::normalizeForOutput(versionName.c_str()).c_str()); String8 splitName = AaptXml::getAttribute(tree, NULL, "split"); - if (!splitName.isEmpty()) { + if (!splitName.empty()) { printf(" split='%s'", ResTable::normalizeForOutput( splitName.c_str()).c_str()); } |