Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: build/android/setup.gyp

Issue 1136573002: Use the Errorprone Compiler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using the Compiler Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/android/setup.gyp
diff --git a/build/android/setup.gyp b/build/android/setup.gyp
index b3c3422163fd0b6bed38b1df95825e30ca892e7f..a3fca3b2358526f836a914fe802f0a2e0ed2c88a 100644
--- a/build/android/setup.gyp
+++ b/build/android/setup.gyp
@@ -16,7 +16,7 @@
{
'destination': '<(SHARED_LIB_DIR)/',
'files': [
- '<(android_libcpp_libs_dir)/libc++_shared.so',
+ '<(android_stlport_libs_dir)/libstlport_shared.so',
jbudorick 2015/05/07 18:49:27 Oh, you haven't rebased in a while. Do so before y
raywilliams_chromium 2015/05/11 19:52:25 Done.
raywilliams_chromium 2015/05/11 19:52:25 Yeah, that caused some false changes in this revie
],
},
],
@@ -77,6 +77,34 @@
},
],
}, # build_output_dirs
+ {
+ 'target_name': 'sun_tools_java',
+ 'type': 'none',
+ 'variables': {
+ 'found_jar_path': '<(PRODUCT_DIR)/sun_tools_java/tools.jar',
+ 'jar_path': '<(found_jar_path)',
+ },
+ 'includes': [
+ '../../build/host_prebuilt_jar.gypi',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'find_sun_tools_jar',
+ 'variables' : {
+ },
+ 'inputs' : [
+ 'gyp/find_sun_tools_jar.py',
+ 'gyp/util/build_utils.py',
+ ],
+ 'outputs': [
+ '<(found_jar_path)',
+ ],
+ 'action': [
+ 'python', 'gyp/find_sun_tools_jar.py',
+ '--output', '<(found_jar_path)',
+ ],
+ },
+ ],
+ }, # sun_tools_java
]
}
-

Powered by Google App Engine
This is Rietveld 408576698