diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 21:19:47 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 21:19:47 +0000 |
| commit | 0e2dd8cd3367c4f2535eb1f915b7f9db05ed4e48 (patch) | |
| tree | 896b3854f960e5c6e5c0479adbc163cf742d866a /build | |
| parent | ee6a5273bd82f08c5563011e734208f37972be1a (diff) | |
| download | chromium_src-0e2dd8cd3367c4f2535eb1f915b7f9db05ed4e48.zip chromium_src-0e2dd8cd3367c4f2535eb1f915b7f9db05ed4e48.tar.gz chromium_src-0e2dd8cd3367c4f2535eb1f915b7f9db05ed4e48.tar.bz2 | |
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
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/gyp/jar_toc.py | 4 |
1 files changed, 1 insertions, 3 deletions
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)) - |