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

Unified Diff: base/BUILD.gn

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « DEPS ('k') | base/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index d94b4400107fd1bba26ec8313ea1a83343cfa974..84beb15e2c6368595fc0245dfd4b88cd20767cf3 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -57,6 +57,7 @@ component("base") {
"android/jni_weak_ref.h",
"android/library_loader/library_loader_hooks.cc",
"android/library_loader/library_loader_hooks.h",
+ "android/library_loader/library_load_from_apk_status_codes.h",
"android/memory_pressure_listener_android.cc",
"android/memory_pressure_listener_android.h",
"android/java_handler_thread.cc",
@@ -507,10 +508,12 @@ component("base") {
"process/process_metrics_win.cc",
"process/process_posix.cc",
"process/process_win.cc",
- "profiler/scoped_profile.cc",
- "profiler/scoped_profile.h",
"profiler/alternate_timer.cc",
"profiler/alternate_timer.h",
+ "profiler/scoped_profile.cc",
+ "profiler/scoped_profile.h",
+ "profiler/scoped_tracker.cc",
+ "profiler/scoped_tracker.h",
"profiler/tracked_time.cc",
"profiler/tracked_time.h",
"rand_util.cc",
@@ -1340,7 +1343,6 @@ test("base_unittests") {
"//base/test:run_all_unittests",
"//base/test:test_support",
"//base/third_party/dynamic_annotations",
- "//base/third_party/nspr",
"//testing/gmock",
"//testing/gtest",
"//third_party/icu",
@@ -1464,14 +1466,17 @@ if (is_android) {
}
# GYP: //base.gyp:base_java_application_state
+ # GYP: //base.gyp:base_java_library_load_from_apk_status_codes
# GYP: //base.gyp:base_java_memory_pressure_level
java_cpp_enum("base_android_java_enums_srcjar") {
sources = [
"android/application_status_listener.h",
+ "android/library_loader/library_load_from_apk_status_codes.h",
"memory/memory_pressure_listener.h",
]
outputs = [
"org/chromium/base/ApplicationState.java",
+ "org/chromium/base/library_loader/LibraryLoadFromApkStatusCodes.java",
"org/chromium/base/MemoryPressureLevel.java",
]
}
« no previous file with comments | « DEPS ('k') | base/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698