create_test_jar.sh, loading-test{,2}-jar.sh: Migrate dx -> d8
This is attempt 2. Attempt at http://r.android.com/849531 was missing a resource2.txt file that had previously been part of parent.jar. This attempt 2 fixes create_test_jar.sh to add resource2.txt to parent.jar (the previous version of parent.jar appears to have been created some way other than through create_test_jar.sh). I must have missed this difference when verifying the previous CL. This CL also addresses a minor code review comment that had remained unaddressed on the last attempt. Original commit message follows: These .sh scripts created .dex files using the dx command. Since dx is no longer used for Android builds, this CL updates those scripts to use d8 instead. This CL also updates the files generated by those scripts. Since the loading-test* stuff was added in 2011 and barely touched since then, I had a quick look to see if the jars are still used. I've found that {,Base}DexClassLoaderTest.java refers to them. Test: Ran "unzip -l" on each affected .jar to ensure that the set of file paths in them is the same before/after this CL. The only difference in set of jar entries was that all of the new but not all of the old files had an entry for the folder META-INF/ itself rather than only for the file META-INF/MANIFEST.MF. I'm guessing that the old files were created with an old version of the jar tool. I did not examine the *contents* of the files inside the .jars or of the .dex files. Test: atest CtsLibcoreTestCases:libcore.dalvik.system.DexClassLoaderTest Test: atest CtsLibcoreTestCases:libcore.dalvik.system.BaseDexClassLoaderTest Test: atest CtsLibcoreTestCases:libcore.dalvik.system.DelegateLastClassLoaderTest Fixes: 119865052 Change-Id: I20541a2846fa69ce7f976cad6dcf1fb2666a66bf
Loading
Please sign in to comment