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

Unified Diff: base/base.gyp

Issue 14373019: Add base/android/activity_status.cc (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: formatting Created 7 years, 8 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: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 2c46954c3f640811471f1bb3dc0b53c0d4824f86..9555633919fe14fbb5d61cf923b644ec7ca9091d 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -442,6 +442,7 @@
'type': '<(gtest_target_type)',
'sources': [
# Tests.
+ 'android/activity_status_unittest.cc',
'android/jni_android_unittest.cc',
'android/jni_array_unittest.cc',
'android/jni_string_unittest.cc',
@@ -1124,6 +1125,7 @@
'target_name': 'base_jni_headers',
'type': 'none',
'sources': [
+ 'android/java/src/org/chromium/base/ActivityStatus.java',
'android/java/src/org/chromium/base/BuildInfo.java',
'android/java/src/org/chromium/base/CpuFeatures.java',
'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java',
@@ -1144,6 +1146,9 @@
'variables': {
'java_in_dir': '../base/android/java',
},
+ 'dependencies': [
+ 'base_java_activity_state',
+ ],
'includes': [ '../build/java.gypi' ],
'conditions': [
['android_webview_build==0', {
@@ -1154,6 +1159,18 @@
],
},
{
+ 'target_name': 'base_java_activity_state',
+ 'type': 'none',
+ 'sources': [
+ 'android/java/src/org/chromium/base/ActivityState.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/base',
+ 'template_deps': ['android/activity_state_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ },
+ {
'target_name': 'base_java_test_support',
'type': 'none',
'dependencies': [

Powered by Google App Engine
This is Rietveld 408576698