From 0e2dd8cd3367c4f2535eb1f915b7f9db05ed4e48 Mon Sep 17 00:00:00 2001 From: "fischman@chromium.org" Date: Mon, 15 Jul 2013 21:19:47 +0000 Subject: android/gyp/jar_toc.py: avoid specifying conflicting flags. http://docs.oracle.com/javase/6/docs/technotes/tools/windows/javap.html says: -protected Shows only protected and public classes and members. So there's no need to specify both -protected and -public. Needed because in JDK7 javap is more particular about its flags and rejects this particular combination. BUG=https://code.google.com/p/webrtc/issues/detail?id=2034 Review URL: https://chromiumcodereview.appspot.com/19244003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211700 0039d316-1c4b-4281-b951-d872f2087c98 --- build/android/gyp/jar_toc.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'build') diff --git a/build/android/gyp/jar_toc.py b/build/android/gyp/jar_toc.py index 9db9d26..54e90bc 100755 --- a/build/android/gyp/jar_toc.py +++ b/build/android/gyp/jar_toc.py @@ -38,8 +38,7 @@ def GetClassesInZipFile(zip_file): def CallJavap(classpath, classes): javap_cmd = [ 'javap', - '-public', - '-protected', + '-protected', # In reality both public & protected. # -verbose is required to get constant values (which can be inlined in # dependents). '-verbose', @@ -109,4 +108,3 @@ def main(argv): if __name__ == '__main__': sys.exit(main(sys.argv)) - -- cgit v1.1