Index: build/android/gyp/javac.py |
diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py |
index c8425bd3aa578880d0b88f46440569c97670b589..5333b7ef1eb95e3419692e2b31a41e2b5283f7d5 100755 |
--- a/build/android/gyp/javac.py |
+++ b/build/android/gyp/javac.py |
@@ -257,6 +257,11 @@ def _ParseOptions(argv): |
help='Boot classpath for javac. If this is specified multiple times, ' |
'they will all be appended to construct the classpath.') |
parser.add_option( |
+ '--use-host-bootclasspath', |
+ action='store_true', |
+ help='Do not use custom bootclasspath even if bootclasspath is ' |
agrieve
2016/08/23 03:52:16
This is pretty weird. Why not just don't pass --bo
aluo
2016/08/24 01:23:38
Acknowledged.
|
+ 'specified.') |
+ parser.add_option( |
'--classpath', |
action='append', |
help='Classpath for javac. If this is specified multiple times, they ' |
@@ -378,8 +383,11 @@ def main(argv): |
)) |
if options.bootclasspath: |
+ if not options.use_host_bootclasspath: |
+ javac_cmd.extend([ |
+ '-bootclasspath', ':'.join(options.bootclasspath) |
+ ]) |
javac_cmd.extend([ |
- '-bootclasspath', ':'.join(options.bootclasspath), |
'-source', '1.7', |
'-target', '1.7', |
]) |