Chromium Code Reviews| Index: base/base.gyp |
| diff --git a/base/base.gyp b/base/base.gyp |
| index 41fac4f9763a4d5c9951fac223df91131154e170..fa6702871fee7c1c46437fd7948feabbb762632c 100644 |
| --- a/base/base.gyp |
| +++ b/base/base.gyp |
| @@ -1324,7 +1324,7 @@ |
| }, |
| 'dependencies': [ |
| 'base_java_application_state', |
| - 'base_java_memory_pressure_level_list', |
| + 'base_java_memory_pressure_level', |
| 'base_native_libraries_gen', |
| ], |
| 'includes': [ '../build/java.gypi' ], |
| @@ -1349,34 +1349,22 @@ |
| 'includes': [ '../build/java.gypi' ], |
| }, |
| { |
| - # GN: //base:base_java_application_state |
| + # GN: //base:base_android_java_enums_srcjar |
| 'target_name': 'base_java_application_state', |
| 'type': 'none', |
| - # This target is used to auto-generate ApplicationState.java |
| - # from a template file. The source file contains a list of |
| - # Java constant declarations matching the ones in |
| - # android/application_state_list.h. |
| - 'sources': [ |
| - 'android/java/src/org/chromium/base/ApplicationState.template', |
| - ], |
| 'variables': { |
| - 'package_name': 'org/chromium/base', |
| - 'template_deps': ['android/application_state_list.h'], |
| + 'source_file': 'android/application_status_listener.h', |
| }, |
| - 'includes': [ '../build/android/java_cpp_template.gypi' ], |
| + 'includes': [ '../build/android/java_cpp_enum.gypi' ], |
| }, |
| { |
| - # GN: //base:base_java_memory_pressure_level_list |
| - 'target_name': 'base_java_memory_pressure_level_list', |
| + # GN: //base:base_android_java_enums_srcjar |
| + 'target_name': 'base_java_memory_pressure_level', |
|
Lei Zhang
2014/10/14 22:52:40
I'm guessing there's no way to combine this with b
mkosiba (inactive)
2014/10/15 09:46:08
It's possible but it would mean all the generated
|
| 'type': 'none', |
| - 'sources': [ |
| - 'android/java/src/org/chromium/base/MemoryPressureLevelList.template', |
| - ], |
| 'variables': { |
| - 'package_name': 'org/chromium/base', |
| - 'template_deps': ['memory/memory_pressure_level_list.h'], |
| + 'source_file': 'memory/memory_pressure_listener.h', |
| }, |
| - 'includes': [ '../build/android/java_cpp_template.gypi' ], |
| + 'includes': [ '../build/android/java_cpp_enum.gypi' ], |
| }, |
| { |
| # GN: //base:base_java_test_support |