diff options
author | Aart Bik <ajcbik@google.com> | 2016-10-24 16:07:59 -0700 |
---|---|---|
committer | Aart Bik <ajcbik@google.com> | 2016-10-24 16:27:36 -0700 |
commit | 7b45a8af9ba8bd512ca85259a6422a120196fe8b (patch) | |
tree | 2aa828cdbfb4c80042ee4d7bb1ddbd65db6e9050 /dexdump | |
parent | 3209925b7c0e173741885e63f747af16dac78469 (diff) | |
download | android_art-7b45a8af9ba8bd512ca85259a6422a120196fe8b.tar.gz android_art-7b45a8af9ba8bd512ca85259a6422a120196fe8b.tar.bz2 android_art-7b45a8af9ba8bd512ca85259a6422a120196fe8b.zip |
Let dexdump prompt filename for zipped multi-dex files.
Test: test-art-host-dexdump test-art-host-gtest-dexdump_test
Bug:32365197
Change-Id: I25a274da93cd3317fd5b18ad578ac4dcad1b83a1
Diffstat (limited to 'dexdump')
-rw-r--r-- | dexdump/dexdump.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/dexdump/dexdump.cc b/dexdump/dexdump.cc index 15b6e17061..30de28eaee 100644 --- a/dexdump/dexdump.cc +++ b/dexdump/dexdump.cc @@ -1581,10 +1581,15 @@ static void dumpClass(const DexFile* pDexFile, int idx, char** pLastPackage) { /* * Dumps the requested sections of the file. */ -static void processDexFile(const char* fileName, const DexFile* pDexFile) { +static void processDexFile(const char* fileName, + const DexFile* pDexFile, size_t i, size_t n) { if (gOptions.verbose) { - fprintf(gOutFile, "Opened '%s', DEX version '%.3s'\n", - fileName, pDexFile->GetHeader().magic_ + 4); + fputs("Opened '", gOutFile); + fputs(fileName, gOutFile); + if (n > 1) { + fprintf(gOutFile, ":%s", DexFile::GetMultiDexClassesDexName(i).c_str()); + } + fprintf(gOutFile, "', DEX version '%.3s'\n", pDexFile->GetHeader().magic_ + 4); } // Headers. @@ -1642,8 +1647,8 @@ int processFile(const char* fileName) { if (gOptions.checksumOnly) { fprintf(gOutFile, "Checksum verified\n"); } else { - for (size_t i = 0; i < dex_files.size(); i++) { - processDexFile(fileName, dex_files[i].get()); + for (size_t i = 0, n = dex_files.size(); i < n; i++) { + processDexFile(fileName, dex_files[i].get(), i, n); } } return 0; |