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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: tools/BUILD.public.expected

Issue 1491943004: Fix ODR violation. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years 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 | « BUILD.public ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 This file is auto-generated by tools/BUILD_simulator.py. 1 This file is auto-generated by tools/BUILD_simulator.py.
2 It expands BUILD.public to make it easy to see changes. 2 It expands BUILD.public to make it easy to see changes.
3 BASE_DEPS = ['*** BEGIN CONDITION_IOS ***', 3 BASE_DEPS = ['*** BEGIN CONDITION_IOS ***',
4 '*** END CONDITION_IOS ***', 4 '*** END CONDITION_IOS ***',
5 '*** BEGIN //conditions:default ***', 5 '*** BEGIN //conditions:default ***',
6 ':opts_sse4', 6 ':opts_sse4',
7 ':opts_ssse3', 7 ':opts_ssse3',
8 '*** END //conditions:default ***', 8 '*** END //conditions:default ***',
9 '*** BEGIN CONDITION_ANDROID ***', 9 '*** BEGIN CONDITION_ANDROID ***',
10 '*** END CONDITION_ANDROID ***'] 10 '*** END CONDITION_ANDROID ***']
(...skipping 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after
1485 'src/ports/SkFontConfigInterface_direct.h', 1485 'src/ports/SkFontConfigInterface_direct.h',
1486 'src/ports/SkFontConfigInterface_direct_google3.cpp', 1486 'src/ports/SkFontConfigInterface_direct_google3.cpp',
1487 'src/ports/SkFontConfigInterface_direct_google3.h', 1487 'src/ports/SkFontConfigInterface_direct_google3.h',
1488 'src/ports/SkFontConfigInterface_direct_google3_factory.cpp', 1488 'src/ports/SkFontConfigInterface_direct_google3_factory.cpp',
1489 'src/ports/SkFontConfigTypeface.h', 1489 'src/ports/SkFontConfigTypeface.h',
1490 'src/ports/SkFontHost_FreeType.cpp', 1490 'src/ports/SkFontHost_FreeType.cpp',
1491 'src/ports/SkFontHost_FreeType_common.cpp', 1491 'src/ports/SkFontHost_FreeType_common.cpp',
1492 'src/ports/SkFontHost_FreeType_common.h', 1492 'src/ports/SkFontHost_FreeType_common.h',
1493 'src/ports/SkFontHost_fontconfig.cpp', 1493 'src/ports/SkFontHost_fontconfig.cpp',
1494 'src/ports/SkFontMgr_custom.cpp', 1494 'src/ports/SkFontMgr_custom.cpp',
1495 'src/ports/SkFontMgr_fontconfig.cpp',
1496 'src/ports/SkGlobalInitialization_default.cpp', 1495 'src/ports/SkGlobalInitialization_default.cpp',
1497 'src/ports/SkImageGenerator_skia.cpp', 1496 'src/ports/SkImageGenerator_skia.cpp',
1498 'src/ports/SkMemory_malloc.cpp', 1497 'src/ports/SkMemory_malloc.cpp',
1499 'src/ports/SkOSFile_posix.cpp', 1498 'src/ports/SkOSFile_posix.cpp',
1500 'src/ports/SkOSFile_stdio.cpp', 1499 'src/ports/SkOSFile_stdio.cpp',
1501 'src/ports/SkOSLibrary.h', 1500 'src/ports/SkOSLibrary.h',
1502 'src/ports/SkOSLibrary_posix.cpp', 1501 'src/ports/SkOSLibrary_posix.cpp',
1503 'src/ports/SkTLS_pthread.cpp', 1502 'src/ports/SkTLS_pthread.cpp',
1504 'src/ports/SkTime_Unix.cpp', 1503 'src/ports/SkTime_Unix.cpp',
1505 '*** END //conditions:default ***', 1504 '*** END //conditions:default ***',
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
1588 'src/ports/SkFontConfigInterface_direct.h', 1587 'src/ports/SkFontConfigInterface_direct.h',
1589 'src/ports/SkFontConfigInterface_direct_google3.cpp', 1588 'src/ports/SkFontConfigInterface_direct_google3.cpp',
1590 'src/ports/SkFontConfigInterface_direct_google3.h', 1589 'src/ports/SkFontConfigInterface_direct_google3.h',
1591 'src/ports/SkFontConfigInterface_direct_google3_factory.cpp', 1590 'src/ports/SkFontConfigInterface_direct_google3_factory.cpp',
1592 'src/ports/SkFontConfigTypeface.h', 1591 'src/ports/SkFontConfigTypeface.h',
1593 'src/ports/SkFontHost_FreeType.cpp', 1592 'src/ports/SkFontHost_FreeType.cpp',
1594 'src/ports/SkFontHost_FreeType_common.cpp', 1593 'src/ports/SkFontHost_FreeType_common.cpp',
1595 'src/ports/SkFontHost_FreeType_common.h', 1594 'src/ports/SkFontHost_FreeType_common.h',
1596 'src/ports/SkFontHost_fontconfig.cpp', 1595 'src/ports/SkFontHost_fontconfig.cpp',
1597 'src/ports/SkFontMgr_custom.cpp', 1596 'src/ports/SkFontMgr_custom.cpp',
1598 'src/ports/SkFontMgr_fontconfig.cpp',
1599 'src/ports/SkGlobalInitialization_default.cpp', 1597 'src/ports/SkGlobalInitialization_default.cpp',
1600 'src/ports/SkImageGenerator_skia.cpp', 1598 'src/ports/SkImageGenerator_skia.cpp',
1601 'src/ports/SkMemory_malloc.cpp', 1599 'src/ports/SkMemory_malloc.cpp',
1602 'src/ports/SkOSFile_posix.cpp', 1600 'src/ports/SkOSFile_posix.cpp',
1603 'src/ports/SkOSFile_stdio.cpp', 1601 'src/ports/SkOSFile_stdio.cpp',
1604 'src/ports/SkOSLibrary.h', 1602 'src/ports/SkOSLibrary.h',
1605 'src/ports/SkOSLibrary_posix.cpp', 1603 'src/ports/SkOSLibrary_posix.cpp',
1606 'src/ports/SkTLS_pthread.cpp', 1604 'src/ports/SkTLS_pthread.cpp',
1607 'src/ports/SkTime_Unix.cpp'] 1605 'src/ports/SkTime_Unix.cpp']
1608 COPTS = ['*** BEGIN CONDITION_IOS ***', 1606 COPTS = ['*** BEGIN CONDITION_IOS ***',
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
2225 'third_party/ktx'] 2223 'third_party/ktx']
2226 LINKOPTS = ['*** BEGIN //conditions:default ***', 2224 LINKOPTS = ['*** BEGIN //conditions:default ***',
2227 '-ldl', 2225 '-ldl',
2228 '*** END //conditions:default ***', 2226 '*** END //conditions:default ***',
2229 '*** BEGIN CONDITION_ANDROID ***', 2227 '*** BEGIN CONDITION_ANDROID ***',
2230 '-ldl', 2228 '-ldl',
2231 '-lEGL', 2229 '-lEGL',
2232 '*** END CONDITION_ANDROID ***'] 2230 '*** END CONDITION_ANDROID ***']
2233 SSE4_SRCS = ['src/opts/SkBlitRow_opts_SSE4.cpp', 'src/opts/SkOpts_sse41.cpp'] 2231 SSE4_SRCS = ['src/opts/SkBlitRow_opts_SSE4.cpp', 'src/opts/SkOpts_sse41.cpp']
2234 SSSE3_SRCS = ['src/opts/SkBitmapProcState_opts_SSSE3.cpp', 'src/opts/SkOpts_ssse 3.cpp'] 2232 SSSE3_SRCS = ['src/opts/SkBitmapProcState_opts_SSSE3.cpp', 'src/opts/SkOpts_ssse 3.cpp']
OLDNEW
« no previous file with comments | « BUILD.public ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698