diff options
| author | 2023-09-13 22:08:53 +0000 | |
|---|---|---|
| committer | 2023-09-13 22:08:53 +0000 | |
| commit | d001ea5b7242f110530e339d479b28b29dadc242 (patch) | |
| tree | 461583516b23b03f09774f48e416790fed432551 /tools/aapt/Command.cpp | |
| parent | 20bb26382d5244b979baa8a6d9a42cc92f208d5b (diff) | |
| parent | 41363ba9fceec76e0233db8889d75e986b91f39a (diff) | |
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044
Change-Id: I0ad1370690eb3763c4d2a7a361bc91f22fd15919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 800466aa587f..43a8b52f2766 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -401,7 +401,7 @@ static void printUsesImpliedPermission(const String8& name, const String8& reaso Vector<String8> getNfcAidCategories(AssetManager& assets, const String8& xmlPath, bool offHost, String8 *outError = NULL) { - Asset* aidAsset = assets.openNonAsset(xmlPath, Asset::ACCESS_BUFFER); + Asset* aidAsset = assets.openNonAsset(xmlPath.c_str(), Asset::ACCESS_BUFFER); if (aidAsset == NULL) { if (outError != NULL) *outError = "xml resource does not exist"; return Vector<String8>(); @@ -2760,7 +2760,7 @@ int doPackage(Bundle* bundle) appendPath(dependencyFile, "R.java.d"); } // Make sure we have a clean dependency file to start with - fp = fopen(dependencyFile, "w"); + fp = fopen(dependencyFile.c_str(), "w"); fclose(fp); } @@ -2849,7 +2849,7 @@ int doPackage(Bundle* bundle) if (bundle->getGenDependencies()) { // Now that writeResourceSymbols or writeAPK has taken care of writing // the targets to our dependency file, we'll write the prereqs - fp = fopen(dependencyFile, "a+"); + fp = fopen(dependencyFile.c_str(), "a+"); fprintf(fp, " : "); bool includeRaw = (outputAPKFile != NULL); err = writeDependencyPreReqs(bundle, assets, fp, includeRaw); |