summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-06Merge from Chromium at DEPS revision db3f05efe0f9HEADwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-m-preview-2android-m-preview-1android-m-previewub-webview-m40-releasemaster-soongmastermainTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I60d0e38401d2444cd8c029e28b930554938d39c7
2014-11-05Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
487c0b6ae8b44932e45347211bca0e8387718436 This commit was generated by merge_from_chromium.py. Change-Id: I52ec8f577a9b64496a39bdf9a197e7c527f9356a
2014-11-05Set ZERO_AR_DATE=1 when running libtool.maruel@chromium.org
Ref: http://www.opensource.apple.com/source/cctools/cctools-809/misc/libtool.c Adhoc testing with base_unittests reduced non-deterministic bytes from ~2347 to ~174. It's definitely the lowest hanging fruit, which will permit us to focus on the remaining bytes. R=thakis@chromium.org BUG=chromium:330262 Review URL: https://codereview.chromium.org/699083004 git-svn-id: http://gyp.googlecode.com/svn/trunk@1998 78cadc50-ecff-11dd-a971-7dbc132099af
2014-11-04msvs: Fix rule dependencies for VS2013sbaig1@bloomberg.net
This commit does two things to fix rules for VS2013: * Don't exclude rule 'input' files (i.e. the files that will be used as 'AdditionalDependencies' in the msbuild rule definition). * Use a 'CustomBuild' element for 'AdditionalDependencies' files, instead of using 'None'. This is similar to how the primary input of actions is added in '_AddMSBuildAction'. Also, re-enable the test/rules-rebuild/gyptest-default.py test for VS2013. BUG=gyp:465 R=scottmg@chromium.org Review URL: https://codereview.chromium.org/699203003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1997 78cadc50-ecff-11dd-a971-7dbc132099af
2014-10-30Switch to 2013 now that it's what's on the botsscottmg@chromium.org
Chromium only supports 2013 now, and the bots no longer have older versions. Support for other versions still maintained, just not on buildbot. R=sbaig1@bloomberg.net Review URL: https://codereview.chromium.org/647043003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1996 78cadc50-ecff-11dd-a971-7dbc132099af
2014-10-28Add indentation offset guess for gyp emacs mode.thakis@chromium.org
This fixes the indentation for some of the gyp files using 4 spaces indentation instead of the usual 2. Also adds "ldflags" in the list of keywords. Review URL: https://codereview.chromium.org/598023002/ Patch from Fabrice de Gans <fdegans@chromium.org>! git-svn-id: http://gyp.googlecode.com/svn/trunk@1995 78cadc50-ecff-11dd-a971-7dbc132099af
2014-10-27Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
b13d8f243da15ded051e87e663c4f2c2fcc5804c This commit was generated by merge_from_chromium.py. Change-Id: I78ae1d6afbb6131b0087ba7456c6ec684d931dd7
2014-10-27Merge from Chromium at DEPS revision 614f7b807940Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia5907b240acf3d9443c73353e6ada203505b9dea
2014-10-24Moves warning about invalid targets into 'invalid_targets' in resultsky@chromium.org
Previously if an invalid_target was supplied analyze would report it via 'warning'. I'm moving that warning to 'invalid_targets' and providing the list of invalid targets there. BUG=426892 TEST=covered by tests R=scottmg@chromium.org Review URL: https://codereview.chromium.org/671233004 git-svn-id: http://gyp.googlecode.com/svn/trunk@1994 78cadc50-ecff-11dd-a971-7dbc132099af
2014-10-24Stop checking for duplicate basenamesscottmg@chromium.org
Chromium doesn't care about MSVC08 or Mac OS X makefiles anymore, whereas some third_party libraries we'd like to use within Chromium contain source files with duplicate basenames. Discussion link: https://groups.google.com/a/chromium.org/d/msg/chromium-dev/0rDiXgLvywY/sm0LSj-hiDIJ Patch from mdempsky@chromium.org R=scottmg@chromium.org Review URL: https://codereview.chromium.org/670063006 git-svn-id: http://gyp.googlecode.com/svn/trunk@1993 78cadc50-ecff-11dd-a971-7dbc132099af
2014-10-22Simplify and optimize FindCyclesscottmg@chromium.org
Finding cycles in a directed graph only requires a simple depth first traversal, it does not require checking every path in the graph. This is now fast enough to actually identify and print cycles between targets. Changes the error message slightly for file and target cycles, and adds tests for both those cases. Patch from cjhopman@chromium.org. R=scottmg@chromium.org Review URL: https://codereview.chromium.org/664253005 git-svn-id: http://gyp.googlecode.com/svn/trunk@1992 78cadc50-ecff-11dd-a971-7dbc132099af
2014-10-21Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
a61e860884929dd46cb55de7916a7ba067a8a655 This commit was generated by merge_from_chromium.py. Change-Id: Ide13800347ff3790abe692dc84e71b17656a7a56
2014-10-21Add (partial) support for assets catalogsdefresne@chromium.org
Add supports for assets catalog to ninja generator (make generator does not support them but avoid copying the catalog into the bundle). Only supports generating compressed catalog, so will only work if target is Mac OS X >= 10.9 or iOS >= 7.0. Support for application icon and for launch image is partially implemented in that there is no way to enable it. BUG=gyp:458 git-svn-id: http://gyp.googlecode.com/svn/trunk@1991 78cadc50-ecff-11dd-a971-7dbc132099af
2014-10-19Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
9202573e476f9f61341aec21b585cdc984141916 This commit was generated by merge_from_chromium.py. Change-Id: Ie18d76c8733096d38644cab37dc5c9ef7a727e61
2014-10-17Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
9e65902d36018e0ad70901e8f2348ce1d11d4032 This commit was generated by merge_from_chromium.py. Change-Id: Ic4560992b07c897e9b116a8d5adf6c27f76d60e3
2014-10-17android: Build against NDK prebuilts, not system libraries.torne@chromium.org
To allow the chromium WebView to build unbundled, we need to stop linking to system libraries and instead link to the prebuilt libraries in the NDK. All modules compiled for target now specify LOCAL_SDK_VERSION with a valid version of the SDK (defaulting to 19, the oldest version on which the WebView builds). This can be overridden with the generator flag "aosp_sdk_version". Instead of converting library flags of the form "-lfoo" to entries in LOCAL_SHARED_LIBRARIES, which causes a dependency on the system version of the library, simply pass these flags through in ldflags. The NDK library path is set automatically if LOCAL_SDK_VERSION is defined and the correct version of these libraries will be found. BUG=chromium:409851 R=primiano@chromium.org, thakis@chromium.org Review URL: https://codereview.chromium.org/571053003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1990 78cadc50-ecff-11dd-a971-7dbc132099af
2014-10-13gypd: update with required default variables.torne@chromium.org
Update the list of identity variables in gypd so that the generator will run successfully on Chromium, which uses these variables predefined by other generators. BUG= R=bradnelson@google.com Review URL: https://codereview.chromium.org/642933007 git-svn-id: http://gyp.googlecode.com/svn/trunk@1989 78cadc50-ecff-11dd-a971-7dbc132099af
2014-10-06Add Ninja support for MSVS $(TargetExt), $(TargetFileName) and $(TargetPath) ↵chrisha@chromium.org
macros. BUG=gyp:462 R=scottmg@chromium.org Review URL: https://codereview.chromium.org/629543002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1988 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-30Merge from Chromium at DEPS revision 267aeeb8d85candroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devPrimiano Tucci
This commit was generated by merge_to_master.py. Change-Id: I3482cf8f4cb05f125009d224dcff02ca57b23446
2014-09-26ninja: Don't rerun actions/rules based on where gyp was invokedsbaig1@bloomberg.net
Right now, ninja generates unique names for actions/rules by combining the action/rule name with a hash on the qualified_target. However, the path of the qualified_target is relative to where gyp was invoked from. So, the following gyp command: gyp --depth=. foo/bar.gyp will generate a different hash than: cd foo gyp --depth=../ bar.gyp Since the hash is different, this causes actions/rules to get rerun based on where gyp happened to be invoked from. This commit fixes this issue by using a qualified_target relative to the toplevel_dir, rather than the current working directory. Also, the self.qualified_target in NinjaWriter is only used for the hash, so we can remove it and replace it with a precomputed hash for all actions/rules. BUG= R=scottmg@chromium.org Review URL: https://codereview.chromium.org/607083002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1987 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-25Add support for MIDL include directoriessbaig1@bloomberg.net
This adds support for 'midl_include_dirs', which is handled like 'include_dirs' and 'resource_include_dirs', except this is for the MIDL tool. One notable difference is that, unlike 'resource_include_dirs', the 'midl_include_dirs' property doesn't default to 'include_dirs'. This is to prevent any change in behavior for any existing gyp files that don't set 'midl_include_dirs'. Also, MIDL include directories are quite a different concept to C/C++ include directories. BUG= R=scottmg@chromium.org Review URL: https://codereview.chromium.org/602073003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1986 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-25Added msvs_enable_winrt to enable creating Windows Store compatible projects ↵scottmg@chromium.org
for .dlls that are consumed by WinRT applications. Patch from coopp@microsoft.com. BUG= R=scottmg@chromium.org Review URL: https://codereview.chromium.org/607553002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1985 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-24ninja win: Add support for 'CallingConvention'sbaig1@bloomberg.net
Each calling convention decorates C functions in a different way, so we can use that to test the flag. BUG= R=scottmg@chromium.org Review URL: https://codereview.chromium.org/597993003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1984 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-24Revert "I need this change to create Windows 8.1/Windows Phone 8.1 projects ↵scottmg@chromium.org
that compile modules that can be consumed by Windows Store Applications (WinRT)." This reverts commit 397b1c684b0b07a38f485f091cc4394a3d733334. Failing on win64 bots per http://build.chromium.org/p/tryserver.nacl/builders/gyp-win64/builds/1896 BUG= Review URL: https://codereview.chromium.org/596023003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1983 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-23Revert r1978 and r1979scottmg@chromium.org
BUG= Review URL: https://codereview.chromium.org/594923002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1982 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-23I need this change to create Windows 8.1/Windows Phone 8.1 projects that ↵scottmg@chromium.org
compile modules that can be consumed by Windows Store Applications (WinRT). This change is required as a prerequisite to adding proper Windows Store (8.1 only) support to Google's ANGLE codebase. Patch from coopp@microsoft.com. R=scottmg@chromium.org Review URL: https://codereview.chromium.org/521693002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1981 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-23Adds swift file support to xcode generation.justincohen@chromium.org
BUG= Patch from Josh Converse <jconverse@google.com>! R=justincohen@chromium.org, thomasvl@chromium.org Review URL: https://codereview.chromium.org/560683003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1980 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-23Don't run windows tests on other platformsscottmg@chromium.org
Build fix TBR=timurrrr@chromium.org Review URL: https://codereview.chromium.org/598643003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1979 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-23Don't return unfound VS version, raise insteadscottmg@chromium.org
This fallback behaviour may have worked at some point, but doesn't any more, so simply error out with a clear message rather than trying to continue. R=timurrrr@chromium.org BUG=https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/O_OGfq2nhSw Review URL: https://codereview.chromium.org/595543003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1978 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-13Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
46282cedf40ff7fe803be4af357b9d59050f02e4 This commit was generated by merge_from_chromium.py. Change-Id: Ic9e634e90d0fc142bc58bdfcc1a27e4f45b1f9cd
2014-09-12android: Add a way to override build system variables.torne@chromium.org
Add a key 'aosp_build_settings' which a target can use to set Android build system variables in the generated makefile, for edge cases not directly supported by gyp. aosp_build_settings is a dictionary which maps variable names to values (values may be integers, strings or lists; all values will be quoted appropriately for make and lists will be converted to whitespace-separated form). BUG= R=primiano@chromium.org, thakis@chromium.org Review URL: https://codereview.chromium.org/565743004 git-svn-id: http://gyp.googlecode.com/svn/trunk@1977 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-12android: Don't emit useless info into generated makefiles.torne@chromium.org
To make the generated makefiles smaller and slightly easier to debug, omit information that is useless: * Don't emit LDFLAGS for static libraries as the linker is not invoked. * For static libraries, only include system libraries in the lists of libraries to link against. The system libraries are required in case they provide implicit include paths, but there's no need to include the large list of gyp-generated targets. * Don't emit empty lists of libraries to link against. * Don't bother setting LOCAL_MODULE_TAGS to optional as that's the default value. Also, stop attempting to remove standard system include paths; the list is out of date, never matches anything in the Chromium build, and it doesn't really matter if a standard path is duplicated anyway. BUG= R=primiano@chromium.org Review URL: https://codereview.chromium.org/565883002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1976 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-12Fix indentation for emacs and add missing keyword.thakis@chromium.org
Closing brackets are now properly indented with the opening bracket. Also adds "cflags_cc" in the list of keywords BUG= Review URL: https://codereview.chromium.org/560263003/ R=gavinp@chromium.org Patch from Fabrice de Gans-Riberi <fdegans@chromium.org>! git-svn-id: http://gyp.googlecode.com/svn/trunk@1975 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-09Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
94b57d39a88ceb03e228804eec4b9013c5ea8b4c This commit was generated by merge_from_chromium.py. Change-Id: Ib4056146058977e349f4127c6f7757e07054d759
2014-09-09Changes ninja generator to only output empty names if not already outputsky@chromium.org
This builds on https://codereview.chromium.org/543743003/ . BUG=410410 TEST=covered by test now R=thakis@chromium.org Review URL: https://codereview.chromium.org/547393003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1974 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-05Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
1ff523f4eccd38fb9f73e60dddd895736ce90346 This commit was generated by merge_from_chromium.py. Change-Id: I09db4caa53f4e9192c3638f21faf7d5aedef59ab
2014-09-04Changes the ninja generator to output phony targets for uninteresting targetssky@chromium.org
This way you can pass these targets to the build system and not get errors. BUG=410410 TEST=covered by test now R=thakis@chromium.org Review URL: https://codereview.chromium.org/543743003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1973 78cadc50-ecff-11dd-a971-7dbc132099af
2014-09-03Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
6760f5b1a4852fd6ccbe4ffc409d73edac445744 This commit was generated by merge_from_chromium.py. Change-Id: I89d5410386f4fcadf1e51460560ef91b7379e1db
2014-09-02Makes matching of build files work when absolutesky@chromium.org
Matching wasn't working if paths supplied were absolute. gyp_chromium triggers absolute paths, so picking up modified gyp/gypi files wasn't working when analyzer run from chrome. BUG=109173 TEST=none R=scottmg@chromium.org Review URL: https://codereview.chromium.org/534793002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1972 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-28Support for custom NM/readelf binaries in your toolchain.dimator@google.com
Background: nm and readelf are used by ninja.py to generate .TOC files. These .TOC files are what determine when something needs rebuilding. ninja.py uses distinct commands for host vs target tools for most things in the toolchain (cc, c++, ld,), via make_global_settings, but it fails to do so for nm & readelf. This is not by design, but it has worked thus far by chance: The default 'nm' and 'readelf' in most people's PATH are the system variants, and the Linux versions of these tools happen to work. However, the project I'm working on has engineers on Macs developing for android. The system-supplied 'nm' and 'readelf' on Mac do NOT work for e.g. Android arm binaries, which leads me to this fix. This fix allows for specifying NM and READELF via make_global_settings, so we can point those variables to the correct ones for the given toolchain/target. BUG= R=thakis@chromium.org Review URL: https://codereview.chromium.org/164023009 git-svn-id: http://gyp.googlecode.com/svn/trunk@1971 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-28Merge from Chromium at DEPS revision 291560Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I3120652020626880a6f412b36ac4188f7ff86bbd
2014-08-26Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
43a3b907eb20bd59c28c6e315b3d9e348ab57ac7 This commit was generated by merge_from_chromium.py. Change-Id: I639cb9a4bd0ee5323c918eff5de321403bab6fbb
2014-08-25android: Support host multilib builds.thakis@chromium.org
The Android build system now supports multilib 32/64-bit host builds as well as target builds, and Chromium needs to make use of this to properly support compiling V8 for host. Introduce a GYP_HOST_VAR_PREFIX variable that works equivalently to GYP_VAR_PREFIX and use it in all the places where the first/second host architecture must be selected, and also introduce GYP_HOST_MULTILIB to enable the top level makefile to specify whether it wants 32-bit or 64-bit host binaries. BUG=chromium:358141 Review URL: https://codereview.chromium.org/301373002 Patch from Torne <torne@chromium.org>! git-svn-id: http://gyp.googlecode.com/svn/trunk@1970 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-22Makes analyzer output names of all executable target typessky@chromium.org
This makes it easier to detect if something is going to be built without knowing all the names of dependent targets. For example, in chrome it's typical to have a _run target, eg browser_tests_run. Without this the chrome side would have to look for all the _foo targets. BUG=109173 TEST=none R=scottmg@chromium.org Review URL: https://codereview.chromium.org/496363004 git-svn-id: http://gyp.googlecode.com/svn/trunk@1969 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-22android: Make buildbot able to use a custom manifest.torne@chromium.org
In order to support rolling to a new version of AOSP to run gyp tests (to pick up android build system changes), introduce logic in the buildbot script to compare the current manifest being used with the one in the gyp tree and resync/compile android if it changes. Check in an initial version of this manifest which is pinned to a recent revision of AOSP's master branch. BUG=gyp:324 R=jbudorick@chromium.org, torne@chromium.org Review URL: https://codereview.chromium.org/493743002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1968 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-19Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
b38e5f2f93fa5b31a6001bd21b9d8dcbf73e44e7 This commit was generated by merge_from_chromium.py. Change-Id: Ide8ea95cde4d50b827c99556bef533b85232e6b9
2014-08-19Merge from Chromium at DEPS revision 290040android-wear-5.1.1_r1android-wear-5.1.0_r1Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia957cd5569a5c62711d273132c342efa9c54f05b
2014-08-19ninja win: don't expect pdb to be generated when GenerateDebugInformation: falsescottmg@chromium.org
if comparison was incorrect for truthy values when added at https://codereview.chromium.org/126443004/ (such as 'false'). Test addition fails before this CL. R=thakis@chromium.org, sky@chromium.org BUG=chromium:404872 Review URL: https://codereview.chromium.org/483133002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1967 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-18Makes the analyzer output the set of targets needing a buildsky@chromium.org
The set of build targets is the minimal set of targets reachable from the all target that contains one of the specified files (matched target), or depeneds on the set of matched targets. BUG=109173 TEST=none R=scottmg@chromium.org Review URL: https://codereview.chromium.org/481433003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1966 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-13Removes old way to specify files to look forsky@chromium.org
This was from the first version and is no longer used. Also cleaned up tests as well. BUG=none TEST=none R=scottmg@chromium.org Review URL: https://codereview.chromium.org/473483002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1965 78cadc50-ecff-11dd-a971-7dbc132099af
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 07:33:22 +0000