summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2014-08-12Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
ed274e3ea5885bc28cf6249e848cf696d0e89263 This commit was generated by merge_from_chromium.py. Change-Id: Idc71e7beb4806782b026623e1943a310d197809e
2014-08-12Merge from Chromium at DEPS revision 288042Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I579101318ff77c5e0666a08e4acd86ffb7277d4c
2014-08-12Provide a way to suppress implicit MIDL generation rules for actionsscottmg@chromium.org
For IDL files, GYP ninja normally generates rules to build MIDL unless there are explicit rules. This special casing only works for rules, but not actions. In blink, we are going to add an action which runs blink's IDL compiler to generate IDL dictionary implementation .h/.cpp files, which means that we need a way to similar logic for actions. This CL introduces 'explicit_idl_action' flag for such purpose. Patch from bashi@chromium.org. R=scottmg@chromium.org Review URL: https://codereview.chromium.org/440293002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1964 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-06Style changes for analyzersky@chromium.org
__ -> _ and lots of single newlines to double newlines. BUG=none R=scottmg@chromium.org Review URL: https://codereview.chromium.org/445113002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1963 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-06Currently I've special cased gyp* file modifications higher in thesky@chromium.org
stack. By that I mean if a gyp* file has been modified I don't run analyze and assume everything has changed. This change adds support for modification to gyp* files. If a gyp* file has changed it assumes all targets in the file are modified. Similarly if an included file has been modified all targets in the file that did the include are considered modified. Lastly, if one of the modified files is specified on the command line via -I the I early out and assume everything needs to be recompiled. BUG=109173 R=scottmg@chromium.org Review URL: https://codereview.chromium.org/442083004 git-svn-id: http://gyp.googlecode.com/svn/trunk@1962 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-01Pull in relevant targets when using xcode-ninjasdefresne@chromium.org
The tests gyptest-actions, gyptest-copies and gyptest-rules fail when using the xcode-ninja generator because xcode-ninja (by design) only creates targets for proper executables. In order for these three tests to pass, the targets they rely on need to be included explicitly. BUG=gyp:442 TEST=Run ./gyptest.py -f xcode-ninja test/generator-output/ Expected: all tests pass (instead of failing the three mentioned above). R=sdefresne@chromium.org, justincohen@chromium.org Review URL: https://codereview.chromium.org/423753003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1961 78cadc50-ecff-11dd-a971-7dbc132099af
2014-08-01Guard against configurations without 'xcode_settings'sdefresne@chromium.org
e.g. test/generator-output/src/prog1.gyp TEST=Run ./gyptest.py -f xcode-ninja test/generator-output/gyptest-top-all.py Expected to fail with OSError: [Errno 13] Permission denied: 'prog1.ninja.xcworkspace' (instead of KeyError: 'xcode_settings') R=sdefresne@chromium.org, justincohen@chromium.org Review URL: https://codereview.chromium.org/428913002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1960 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-31Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
ac2684beed6e8ca04ac5f837c9db869eefec7bb5 This commit was generated by merge_from_chromium.py. Change-Id: I36616486742ab4c073a2b5e3baf84a21d3150b97
2014-07-30Updates analyzer to output to a filesky@chromium.org
File is specified by way of analyzer_output_path. I'm also changing from a hard error if a target can't be found to a warning. I'm also including a new set of tests. I forgot to svn add this last time around. BUG=109173 TEST=covered by tests R=mark@chromium.org Review URL: https://codereview.chromium.org/429243003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1959 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-29Avoid infinite recursion with identity variables.mark@chromium.org
Some generators like gypd and gypsh define the generator_default_variables as an identity expansion. For example, the variable 'INTERMEDIATE_DIR' would expand to '<(INTERMEDIATE_DIR)' which lends to an infinite recursion if a .gyp file uses any of those variables. This patch detects trivial infinite recursive variable expansions like this one and leaves them that way. Patch by Alejandro Deymonnaz <deymo@chromium.org> BUG=141 TEST=`gyp --debug=variables --format=gypd test.gyp` shows avoiding infinite recursion message when test.gyp has an INTERMEDIATE_DIR variable expansion. Review URL: https://codereview.chromium.org/417113009/ git-svn-id: http://gyp.googlecode.com/svn/trunk@1958 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-29Enable custom suffixes for Mac bundles.mark@chromium.org
Patch by Johannes Sartisohn <jsartisohn@google.com> Review URL: https://codereview.chromium.org/401633002/ git-svn-id: http://gyp.googlecode.com/svn/trunk@1957 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-29Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
b95cbeb2b4a56eb33f6568ca2e9fce5b491ce96d This commit was generated by merge_from_chromium.py. Change-Id: Ic84067510ccabd72f82dc2be19f90e24e8aaaddf
2014-07-28Changes analyzer to search for targetssky@chromium.org
Here's a list of the changes: . I'm changing input file to be a JSON file. This allows for passing in more information, such as the set of targets to search for. . Changing output format to be JSON as well. This allows for more structure in outputting other random data. I'm a bit iffy on whether this is good, but it's requested by the recipes side of things which uses analyzer. . You can now specify a set of targets to search for in addition to files. This is intended for things like 'unittests' so that only the set of targets that are effected by the change get run. To enable the new functionality you have to pass in a new switch. Once I integrate these changes into the rest of the stack. I'll remove the old flow. BUG=109173 TEST=covered by tests R=mark@chromium.org Review URL: https://codereview.chromium.org/420383002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1956 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-25ninja: Add support for 'ninja_use_console' in actions/rulessbaig1@bloomberg.net
Setting this to 1 will make ninja use 'pool = console' for the action/rule. BUG= R=thakis@chromium.org Review URL: https://codereview.chromium.org/412283002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1955 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-24This CL adds support for extension in GYP.sdefresne@chromium.org
This CL adds the extension target type and adds the link flags to compile .appex extensions. BUG=gyp:435 R=justincohen@chromium.org, mark@chromium.org, pkl@chromium.org, sdefresne@chromium.org Review URL: https://codereview.chromium.org/376603002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1954 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-21Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Primiano Tucci
39fd3e8ea1c88c144a756f8fe23c1a361ae13495 This commit was generated by merge_from_chromium.py. Change-Id: I2803e03a972897e3a400528e1a6b85d65331ae57
2014-07-20Merge from Chromium at DEPS revision 284076Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: If3d73ed87e487fb027aa4b16dd027424707d817c
2014-07-20ninja/win: Put common msvs_system_include_dirs into %INCLUDE% thakis@chromium.org
Paths in INCLUDE are considered system headers by clang-cl and it will suppress warnings from system headers. BUG=chromium:395405 Review URL: https://codereview.chromium.org/406523005/ git-svn-id: http://gyp.googlecode.com/svn/trunk@1953 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-20Add test files for https://codereview.chromium.org/406523005/thakis@chromium.org
Maybe the try failures are due to the try server not adding the new files correctly, since the test passes for me locally. Add the test files in a separate commit (not used by anything yet) to test this theory. git-svn-id: http://gyp.googlecode.com/svn/trunk@1952 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-17Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
80e01de623edbdfc23bc7c860cccefb4e50e8a7d This commit was generated by merge_from_chromium.py. Change-Id: Ida3dd7868a8830898dc552540845c13451e96039
2014-07-16Fixes bug in path handling of analyzersky@chromium.org
Was using os.getcwd when it needs to use options.toplevel_dir R=mark@chromium.org BUG=383609 TEST=none Review URL: https://codereview.chromium.org/395483002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1951 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-12Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
d1e5ccaf05bac73d817f4959aa94b9bd25069383 This commit was generated by merge_from_chromium.py. Change-Id: Iadfbdaa7b26f09d60a36d4be4ba7ced8e6dd67c3
2014-07-11Fixes two bugs in analyzersky@chromium.org
Wasn't delaing with relative paths outside the repo. NACL does this for things like /usr/include/... When combining relative paths I was missing adding a '/'. This result in paths like baseobserver_list.h instead of base/observer_list.h. BUG=383609 TEST=covered by unit tests R=mark@chromium.org Review URL: https://codereview.chromium.org/383893003 git-svn-id: http://gyp.googlecode.com/svn/trunk@1949 78cadc50-ecff-11dd-a971-7dbc132099af
2014-07-09Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at ↵Android Chromium Automerger
867a23f4b596b7406cce1231a23b44b47bc1a583 This commit was generated by merge_from_chromium.py. Change-Id: I62c1fed116abfbf9885fe9767ebe5c9a1d4e9e9c
2014-06-26Xcode: Add xcdatamodeld = wrapper.xcdatamodeld in extension_map mark@chromium.org
.xcdatamodeld documents are used for Model File Format. https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/CoreDataVersioning/Articles/vmModelFormat.html Note that .xcdatamodel has already been supported since gyp r1529. BUG=303 Patch from Roberto Cosenza <robcos@google.com> via Yohei Yukawa <yukawa@chromium.org> Review URL: https://codereview.chromium.org/351223002/ git-svn-id: http://gyp.googlecode.com/svn/trunk@1948 78cadc50-ecff-11dd-a971-7dbc132099af
2014-06-25Introduce '--no-duplicate-basename-check' option to disable the check of ↵yukawa@chromium.org
duplicate basenames With this CL, the check of duplicate basenames in the same source list can be disabled with '--no-duplicate-basename-check' option. Now GYP generators can handle duplicate basenames except for VCProj generator for Visual C++ 2008 and Makefile generator on Mac. Given that these two generators are no longer actively used, and supposed to be deprecated in future, providing an option to disable this validation should be helpful for some GYP users. Note that these two generators continue to treat duplicate basenames continue as an error regardless of '--no-duplicate-basename-check'. BUG=gyp:264, gyp:384 R=scottmg@chromium.org Review URL: https://codereview.chromium.org/344573002 git-svn-id: http://gyp.googlecode.com/svn/trunk@1947 78cadc50-ecff-11dd-a971-7dbc132099af
2014-06-23Makes analyzer strip off a leading path separatormark@chromium.org
When running in chrome paths are absolute. Also makes chrome build work with analyzer on windows. The specific define I ran into was MSVS_OS_BITS, but I'm sure there are more. BUG=chromium:383609 R=mark@chromium.org Patch by Scott Violet <sky@chromium.org> Review URL: https://codereview.chromium.org/347193005/ git-svn-id: http://gyp.googlecode.com/svn/trunk@1946 78cadc50-ecff-11dd-a971-7dbc132099af
2014-06-20msvs: ensure that failing actions make the build fail with multiple actionsscottmg@chromium.org
The old way of joining multiple commands would take care of failing correctly when there are multiple actions associated with a single file. However, for multiple actions associated with different files (but within the same target), Visual Studio will still create just one .bat file for them all, so we must make sure that each command errors out correctly when it fails. Strictly speaking, the %errorlevel% check is unnecessary for the last command in a target (because the .bat file created by VS contains it already); but it doesn't hurt either, and makes the logic much simpler. Patch from Stefan Haller <stk.haller@googlemail.com>. R=scottmg@chromium.org Review URL: https://codereview.chromium.org/335273006 git-svn-id: http://gyp.googlecode.com/svn/trunk@1945 78cadc50-ecff-11dd-a971-7dbc132099af
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 12:57:42 +0000