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

Side by Side Diff: base/base.gyp

Issue 2165583002: Reland 2: Android: Add support for TraceEvent before the native library is loaded. (patchset #2 id:… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add the GYP changes back, as they're still needed by WebRTC. Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java ('k') | base/base.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 'sources': [ 1416 'sources': [
1417 'android/java/src/org/chromium/base/ApkAssets.java', 1417 'android/java/src/org/chromium/base/ApkAssets.java',
1418 'android/java/src/org/chromium/base/ApplicationStatus.java', 1418 'android/java/src/org/chromium/base/ApplicationStatus.java',
1419 'android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java ', 1419 'android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java ',
1420 'android/java/src/org/chromium/base/BuildInfo.java', 1420 'android/java/src/org/chromium/base/BuildInfo.java',
1421 'android/java/src/org/chromium/base/Callback.java', 1421 'android/java/src/org/chromium/base/Callback.java',
1422 'android/java/src/org/chromium/base/CommandLine.java', 1422 'android/java/src/org/chromium/base/CommandLine.java',
1423 'android/java/src/org/chromium/base/ContentUriUtils.java', 1423 'android/java/src/org/chromium/base/ContentUriUtils.java',
1424 'android/java/src/org/chromium/base/ContextUtils.java', 1424 'android/java/src/org/chromium/base/ContextUtils.java',
1425 'android/java/src/org/chromium/base/CpuFeatures.java', 1425 'android/java/src/org/chromium/base/CpuFeatures.java',
1426 'android/java/src/org/chromium/base/EarlyTraceEvent.java',
1426 'android/java/src/org/chromium/base/EventLog.java', 1427 'android/java/src/org/chromium/base/EventLog.java',
1427 'android/java/src/org/chromium/base/FieldTrialList.java', 1428 'android/java/src/org/chromium/base/FieldTrialList.java',
1428 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java' , 1429 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java' ,
1429 'android/java/src/org/chromium/base/JNIUtils.java', 1430 'android/java/src/org/chromium/base/JNIUtils.java',
1430 'android/java/src/org/chromium/base/JavaHandlerThread.java', 1431 'android/java/src/org/chromium/base/JavaHandlerThread.java',
1431 'android/java/src/org/chromium/base/LocaleUtils.java', 1432 'android/java/src/org/chromium/base/LocaleUtils.java',
1432 'android/java/src/org/chromium/base/MemoryPressureListener.java', 1433 'android/java/src/org/chromium/base/MemoryPressureListener.java',
1433 'android/java/src/org/chromium/base/PathService.java', 1434 'android/java/src/org/chromium/base/PathService.java',
1434 'android/java/src/org/chromium/base/PathUtils.java', 1435 'android/java/src/org/chromium/base/PathUtils.java',
1435 'android/java/src/org/chromium/base/PowerMonitor.java', 1436 'android/java/src/org/chromium/base/PowerMonitor.java',
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
1793 ['include', 'mac/bind_objc_block_unittest_arc\\.mm$'], 1794 ['include', 'mac/bind_objc_block_unittest_arc\\.mm$'],
1794 ['include', 'mac/scoped_nsobject_unittest_arc\\.mm$'], 1795 ['include', 'mac/scoped_nsobject_unittest_arc\\.mm$'],
1795 ], 1796 ],
1796 }] 1797 }]
1797 ], 1798 ],
1798 }, 1799 },
1799 ], 1800 ],
1800 }], 1801 }],
1801 ], 1802 ],
1802 } 1803 }
OLDNEW
« no previous file with comments | « base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java ('k') | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698