Skip to content
This project is mirrored from https://github.com/CherishOS/android_build_blueprint.git. Pull mirroring updated .
  1. Mar 21, 2015
  2. Mar 20, 2015
    • Colin Cross's avatar
      Allow parsing Blueprints files without evaluating · 96e56704
      Colin Cross authored
      Running bpfmt or bpmodify on a Blueprints file that references
      variables defined in a parent Blueprints file causes parse errors
      on unknown variables.  Modify the parser to parse in two modes,
      parser.Parse and parser.ParseAndEval.  The first parses without
      attempting to evaluate variables and expressions, the second
      performs a full evaluation.
      
      Change-Id: Ic11948ea77c8e65379d7260591ada15db0e4f5b9
      96e56704
    • Colin Cross's avatar
      Simplify printer whitespace and newline handling · 85398a91
      Colin Cross authored
      Trying to handle all the whitespace and newline printing inside
      printToken got overly complicated, and resulted in a few bugs in
      the layout around comments and indentation that were hard to fix.
      Rewrite the whitespace and newline handling to be handled directly
      by the object printers, using requestSpace() to ensure whitespace
      is inserted and requestNewline() to ensure a newline is inserted.
      
      Also fixes unnecessarily left aligning all comments that contain
      indentation, and fixes accidentally unindenting comments that are
      the last token in their indented block.
      
      Change-Id: I18707802726107cf0b6ec7de9b542d0ec1d2c0dd
      85398a91
  3. Mar 19, 2015
  4. Mar 16, 2015
  5. Mar 15, 2015
  6. Mar 14, 2015
  7. Mar 13, 2015
    • Colin Cross's avatar
      Split "variant" terminology into "variant" and "variation" · f5e34b98
      Colin Cross authored
      "Variant" has been used to mean two slightly concepts in Blueprint.
      The first and most obvious is a variant of a module, meaning a list
      of all the ways that on version of a module differs from other
      versions of the same modules, for example "arch:arm, link:static".
      The other is for the specific way that a version of a module differs,
      "arch:arm".
      
      Rename all of uses of "variant" as the second meaning to "variation",
      and update the documentation to clarify "variant" vs. "variation".
      This modifies the build logic api to convert CreateVariants to
      CreateVariations.
      
      Change-Id: I789ef209ae6ddd39ec12e0c032f9f47f86698fe6
      f5e34b98
    • Colin Cross's avatar
      Add early mutators · 65569e43
      Colin Cross authored
      The mutators that run after dependencies are resolved can be too late
      to support build logic that needs to vary the dependencies based on
      the mutated axis, for example architecture.  This patch provides an
      EarlyMutator interface that can be used to mutate modules before
      any dependencies have been resolved.
      
      In order for dependencies to be satisifed in a later pass, all
      dependencies of a module must either have an identical variant,
      must have a single variant, or must be inserted using
      DynamicDependencyModuleContext.AddVariantDependency.
      
      Change-Id: Ic6ae57e98edfd6c8c09a7788983128d3e4e992f0
      65569e43
    • Colin Cross's avatar
      Move build actions into modules · ab6d7901
      Colin Cross authored
      Move actionDefs from moduleGroup to moduleInfo.  This will result
      in multiple build.ninja headers for a single Blueprint file module
      if it has multiple variants, each one specifying the variant
      used to generate the following rules.
      
      Change-Id: I414cd4d3266da8c2e92118b295569627ddf48cdd
      ab6d7901
    • Colin Cross's avatar
      Iterate through modules directly · 7addea35
      Colin Cross authored
      Instead of iterating through groups and then iterating through the
      group's modules, iterate through the modules directly.  This will
      allow circular dependencies between groups as long as the individual
      modules don't have circular dependencies.  In order to maintain the
      ordering of modules in a group, each module is considered to have
      an implicit dependency on any earlier modules in the same group.
      
      Change-Id: Ibce67167c7234db70ede0a6b5c2b43fb8e0bb05d
      7addea35
    • Colin Cross's avatar
      Rework the way variant names are stored · e7daa229
      Colin Cross authored
      Replace the array of mutator name/variant name pairs with
      a map of mutator name to variant name, and store the string
      variant name separately.
      
      Change-Id: I181c2fcb05724c8755b90aaf866fdce9ef720b01
      e7daa229
    • Colin Cross's avatar
      Move values from moduleGroup to moduleInfo · ed342d98
      Colin Cross authored
      Move most of the contents of moduleGroup into moduleInfo.  This will
      eventually reduce moduleGroup to a simple list of variants of the
      same module.
      
      Change-Id: I4289eb9953509751d7637558cd6db73373ccdf78
      ed342d98
    • Colin Cross's avatar
      Relax module naming restrictions · 6134a5c6
      Colin Cross authored
      Forcing module names to be valid ninja names is an unnecessary
      restraint on the project build logic.  Allow any string as a
      module name, and sanitize and uniquify the module name for use
      in module-scoped variables.
      
      Also move the module scope to be per-module instead of per-group
      so that modules can use the same local variable name for each variant.
      
      Change-Id: If44cca20712305e2c0b6d6b39daa5eace335c148
      6134a5c6
  8. Mar 11, 2015
    • jgennis's avatar
      Merge pull request #4 from colincross/bugfixes · 50fb0937
      jgennis authored
      Bugfixes
      50fb0937
    • Colin Cross's avatar
      Fix panic when dependency cycle includes the first module visited · 10b54db7
      Colin Cross authored
      The cycle check can panic if the first call to check happens to land
      on the first module in a cycle.  Print the cycle instead of panicking.
      
      Change-Id: I6fc1c66dcc37b1eb6b11b9e65343452af3c8538d
      10b54db7
    • Colin Cross's avatar
      Fix bug when copying slice to itself · 62e681a2
      Colin Cross authored
      If proptools.CopyProperties is passed two values that point same
      slice then setting the destination slice to a new slice will
      overwrite the source slice, and the properties struct that is both
      the source and destination will have an empty slice.  Copy into
      the new slice using a new reflect.Value, and then update the
      destination.
      
      Change-Id: I1bfcdc51e4278ea7c7ed81dafc928a5471219f05
      62e681a2
  9. Mar 10, 2015
  10. Mar 06, 2015
  11. Mar 04, 2015
    • Colin Cross's avatar
      Report variant errors instead of panicing · 174ae059
      Colin Cross authored
      Variant errors can be introduced by Blueprints files, so print
      a module error instead of panicing.
      174ae059
    • Colin Cross's avatar
      Go back to the old Blueprints file format · cb7b9ad6
      Colin Cross authored
      Switch back to:
      moduleType {
          name: value,
          arch: {
              x86: {
                  name: value,
              },
          },
      }
      
      This provides better consistency between properties defined at the
      top level of a module and properties defined inside a map.
      
      The parser will continue to support the other format for now, but the
      printer will only produce the original format.
      cb7b9ad6
    • Colin Cross's avatar
      Print names of files deleted by cleanup phase · d9d92cb7
      Colin Cross authored
      Change-Id: Ia9c5408b1b159843dbc57e2e480ca2972598186d
      d9d92cb7
    • Colin Cross's avatar
      Allow adding maps · 542fd55c
      Colin Cross authored
      Add support for + operator on maps.  The semantics are that keys that
      exist in both maps are added with the + operator, and keys that exist
      in one map are copied to the resulting map.
      
      Change-Id: Iba9a6f886477a1eb7311272d07944800c806e368
      542fd55c
    • Colin Cross's avatar
      Add VisitDirectDeps to module context · c7ffa30b
      Colin Cross authored
      Change-Id: I271db2120aba1a5c99f21198f1eff6370e6e2389
      c7ffa30b
    • Colin Cross's avatar
      Support += assignments · b274e6c8
      Colin Cross authored
      Support += assignments to variables.  Variables are now mutable
      up until they are referenced, then they become immutable.  This
      will allow variables to be modified in a conditional, or allow
      better commenting on why parts of a variable are set.
      
      Change-Id: Iad964da7206b493365fe3686eedd7954e6eaf9a2
      b274e6c8
    • Colin Cross's avatar
      Modify printer to be stricter about extra newlines · 9a103c0e
      Colin Cross authored
      The printer was allowing extra newlines in odd places, for example
      between a property name and the '=' in a module definition.  Make
      newline location stricter by explicitly allowing newlines or
      line comments.
      9a103c0e
    • Colin Cross's avatar
      Exit early from generateModuleBuildActions on error · 8900e9bd
      Colin Cross authored
      generateModuleBuildActions was continuing to call GenerateBuildActions
      on all modules even after one returned an error.  This could cause a
      later module to panic because it was missing information that was
      supposed to be generated by the module that returned an error, hiding
      the earlier error message.
      
      If a module returns an error, stop triggering any new goroutines to
      call GenerateBuildActions on later modules.
      8900e9bd
    • Colin Cross's avatar
      Don't fail cleanup when a file has turned into a directory · 93ef72d2
      Colin Cross authored
      If .ninja_log contains an entry that used to be a file but is now a
      non-empty directory the os.Remove call will fail.  Silently ignore
      this error, if the files in the directory are abandoned the directory
      will be cleaned up when the files are removed.
      93ef72d2
Loading