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

Side by Side Diff: build/common.gypi

Issue 1497743004: Remove run_pie from android/tools now that ICS support is deprecated (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@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
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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 4937 matching lines...) Expand 10 before | Expand all | Expand 10 after
4948 'cflags!': [ 4948 'cflags!': [
4949 '-fstack-protector', 4949 '-fstack-protector',
4950 ], 4950 ],
4951 'cflags': [ 4951 'cflags': [
4952 '-fno-stack-protector', 4952 '-fno-stack-protector',
4953 ], 4953 ],
4954 }], 4954 }],
4955 ], 4955 ],
4956 'target_conditions': [ 4956 'target_conditions': [
4957 ['_type=="executable"', { 4957 ['_type=="executable"', {
4958 # Force android tools to export the "main" symbol so they can be
4959 # loaded on ICS using the run_pie wrapper. See crbug.com/373219.
4960 # TODO(primiano): remove -fvisibility and -rdynamic flags below
4961 # when ICS support will be dropped.
4962 'cflags': [ 4958 'cflags': [
4963 '-fPIE', 4959 '-fPIE',
4964 '-fvisibility=default',
4965 ], 4960 ],
4966 'ldflags': [ 4961 'ldflags': [
4967 '-Bdynamic', 4962 '-Bdynamic',
4968 '-Wl,--gc-sections', 4963 '-Wl,--gc-sections',
4969 '-Wl,-z,nocopyreloc', 4964 '-Wl,-z,nocopyreloc',
4970 '-pie', 4965 '-pie',
4971 '-rdynamic',
4972 # crtbegin_dynamic.o should be the last item in ldflags. 4966 # crtbegin_dynamic.o should be the last item in ldflags.
4973 '<(android_ndk_lib)/crtbegin_dynamic.o', 4967 '<(android_ndk_lib)/crtbegin_dynamic.o',
4974 ], 4968 ],
4975 'libraries': [ 4969 'libraries': [
4976 # crtend_android.o needs to be the last item in libraries. 4970 # crtend_android.o needs to be the last item in libraries.
4977 # Do not add any libraries after this! 4971 # Do not add any libraries after this!
4978 '<(android_ndk_lib)/crtend_android.o', 4972 '<(android_ndk_lib)/crtend_android.o',
4979 ], 4973 ],
4980 }], 4974 }],
4981 ['_type=="shared_library" or _type=="loadable_module"', { 4975 ['_type=="shared_library" or _type=="loadable_module"', {
(...skipping 1388 matching lines...) Expand 10 before | Expand all | Expand 10 after
6370 # settings in target dicts. SYMROOT is a special case, because many other 6364 # settings in target dicts. SYMROOT is a special case, because many other
6371 # Xcode variables depend on it, including variables such as 6365 # Xcode variables depend on it, including variables such as
6372 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6366 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6373 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6367 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6374 # files to appear (when present) in the UI as actual files and not red 6368 # files to appear (when present) in the UI as actual files and not red
6375 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6369 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6376 # and therefore SYMROOT, needs to be set at the project level. 6370 # and therefore SYMROOT, needs to be set at the project level.
6377 'SYMROOT': '<(DEPTH)/xcodebuild', 6371 'SYMROOT': '<(DEPTH)/xcodebuild',
6378 }, 6372 },
6379 } 6373 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698