aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make off-the-shelf order funcs public.HEADstaging/lineage-17.0_merge-android-10.0.0_r9lineage-17.1Jaewoong Jung2019-12-111-6/+6
| | | | | | | These are useful outside the package too when calling proptools.ExtendMatchingProperties. Change-Id: I054eb105e0dd5287aff99b8be137a8b09d52492d
* Snap for 5811135 from ba1ea7583953186a1a5519c0cd1087e403ad516f to ↵android-build-team Robot2019-08-172-11/+33
|\ | | | | | | | | | | qt-qpr1-release Change-Id: I2010b45f225a6ad7bdfa12de5b3bc1348995672e
| * Add SetDefaultDependencyVariationJiyong Park2019-08-162-11/+33
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SetDefaultDependencyVariation sets the variation name that will be used when a dangling dependency is found while a module is being split. A dangling dependency can occur if a module is split to a variant that one of its dependencies is not split into. When the default variation is not set, such dangling dependency is a hard error. But with the new function, the default variation can be set and subsequent calls to CreateVariations and its variations on the same context uses the default variation when necessary. (If even the default variation does not exist for the dependent module, it is an hard error) Note that this is different from calling SetDependencyVariation("foo") followed by CreateVariations("foo", "bar"). In that case, regardless of whether a dependency of the current module has the variant 'bar' or not, only the 'foo' variant is chosen. With SetDefaultDependencyVariation("foo") followed by CreateVariations("foo", "bar"), 'foo' variant is used only when the 'bar' variant of the current module depends on a module that does not have 'bar' variant. Bug: 138103882 Test: m Merged-In: I2c79c3c9e0437fd785b06ca20f43da2963d50b68 (cherry picked from commit 1e2e56dc624bd93845288d803be588c597f0bd6f) Change-Id: I4520ca87487994de024fdbacda3bef6636225f0d
* Merge remote-tracking branch 'aosp/upstream' into merge am: 40d8c975c7 am: ↵Jaewoong Jung2019-03-114-23/+26
|\ | | | | | | | | | | | | | | 4cc6c5f58c am: d251e80778 Change-Id: I8fc4efb7571b3aa03b241ae98355dbd4f3dfd2b3
| * Merge remote-tracking branch 'aosp/upstream' into merge am: 40d8c975c7Jaewoong Jung2019-03-114-23/+26
| |\ | | | | | | | | | | | | | | | am: 4cc6c5f58c Change-Id: Ifd19999b1c03f3bb062c7eeb8015aa938d71b114
| | * Merge remote-tracking branch 'aosp/upstream' into mergeJaewoong Jung2019-03-114-23/+26
| | |\ | | | | | | | | | | | | | | | | | | | | am: 40d8c975c7 Change-Id: I52e69188a56dfcef6353311830dad274f63b37c7
| | | * Merge remote-tracking branch 'aosp/upstream' into mergeJaewoong Jung2019-03-114-23/+26
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: bpdoc preformatted text improvments Fixes: 124332708 Test: m soong_docs Change-Id: I444e4c806d3c44e31d0242e18cc2b6a4ed224ee0
| | | | * Merge pull request #244 from gyias/masterJaewoong Jung2019-03-114-23/+26
| | | | |\ | | | | | | | | | | | | bpdoc preformatted text improvments
| | | | | * bpdoc preformatted text improvmentsJaewoong Jung2019-03-114-23/+26
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Apply preformatted text (<pre>...</pre>) handling logic to module type text too. It used to be applied to property texts only. 2. Improve <pre> handling logic itself for better readability. - Insert a blank line before <pre>. - Prevent from ending <pre> blocks prematurely by checking if an unindented line isn't just a blank line between indented lines. Change-Id: Id40fa668d4c6781caf7ed140b2f40784cdeb8c35
* | | | | Merge remote-tracking branch 'aosp/upstream' into merge_upstream am: ↵Patrice Arruda2019-03-081-9/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8610dfd441 am: 4fd7ad26c2 am: dcf31d03f4 Change-Id: I00472e469f0213e4db0f52039f682f2a2bb48c5c
| * | | | Merge remote-tracking branch 'aosp/upstream' into merge_upstream am: 8610dfd441Patrice Arruda2019-03-081-9/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4fd7ad26c2 Change-Id: I2d464352b74006354f8490bf24213585b281829f
| | * | | Merge remote-tracking branch 'aosp/upstream' into merge_upstreamPatrice Arruda2019-03-081-9/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8610dfd441 Change-Id: I14122e616dc1c4dde85264933f91144c7170eb88
| | | * | Merge remote-tracking branch 'aosp/upstream' into merge_upstreamPatrice Arruda2019-03-081-9/+9
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Moving the ParseBlueprintsFiles go comment in context.go. Bug: N/A Test: N/A Change-Id: I1852f833dbb822035d38852c7f142aaaced9f1a5
| | | | * Merge pull request #243 from patricearruda/masterJaewoong Jung2019-03-081-9/+9
| | | | |\ | | | | | | | | | | | | Moving the ParseBlueprintsFiles comment in context.go.
| | | | | * Moving the ParseBlueprintsFiles go comment in context.go.Patrice Arruda2019-03-081-9/+9
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The go comment for the blueprint.Context.ParseBlueprintsFiles was actually place above the blueprint.Context.ParseFileList. Bug: N/A Test: N/A Change-Id: I065d2f6ec034c614e40de745931f4c87cdb73422
* | | | | Merge remote-tracking branch 'upstream/master' into master am: 9e75985c0d ↵Jaewoong Jung2019-03-081-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 428ebae61a am: 75774eaa99 Change-Id: Ife31fc8f56e80261ebb7583b359f7d88f10f5ce1
| * | | | Merge remote-tracking branch 'upstream/master' into master am: 9e75985c0dJaewoong Jung2019-03-081-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 428ebae61a Change-Id: I364846812e0240559fabef896fcee790a8621a8f
| | * | | Merge remote-tracking branch 'upstream/master' into masterJaewoong Jung2019-03-081-2/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9e75985c0d Change-Id: I44211fd3048da1b65af591654cfe87fdeebb322c
| | | * | Merge remote-tracking branch 'upstream/master' into masterJaewoong Jung2019-03-081-2/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: Panic when copying private properties. Fixes: 126917357 Test: m checkbuild Change-Id: I34a7fd48c99c80cdbaadf547a7e9d84f180a6108
| | | | * Merge pull request #242 from gyias/bpdocJaewoong Jung2019-03-081-2/+1
| | | | |\ | | | | | | | | | | | | Panic when copying private properties.
| | | | | * Panic when copying private properties.Jaewoong Jung2019-03-071-2/+1
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CopyProperties comes across private properties, it silently ignores them. This is error-prone and can result in a bug very hard to debug if the developer is unaware of the behavior. Change-Id: Id6a0752e384ec7fed35728c1e87dbfa95fea84f2
* | | | | Merge remote-tracking branch 'aosp/upstream' into master am: ba03162726 am: ↵Colin Cross2019-03-074-13/+209
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe4eb94eb0 am: 2cab480e58 Change-Id: Idfe38c5264315c2a63a8d237c88312f3419bc0ba
| * | | | Merge remote-tracking branch 'aosp/upstream' into master am: ba03162726Colin Cross2019-03-074-13/+209
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fe4eb94eb0 Change-Id: I3d1be2ddb41257175482d8042750be8d43f93bfb
| | * | | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-03-074-13/+209
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: ba03162726 Change-Id: Ifa003e4b8b4bf9e0153089327eafbc7c2f591606
| | | * | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-03-064-13/+209
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Add PropertyIndexesWithTag Test: m checkbuild Change-Id: I9a0268603f8040fc3133819ed46c45f396551073
| | | | * Merge pull request #241 from colincross/tagindexcolincross2019-03-054-13/+209
| | | | |\ | | | | | | | | | | | | Add PropertyIndexesWithTag
| | | | | * Add PropertyIndexesWithTagColin Cross2019-03-054-13/+209
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function that returns all of the indexes to properties in a property struct that are tagged with `name:"value"`. Test: proptools/tag_test.go Change-Id: I00294934c1a0383c8b64ecaabc0e138682efb2e5
* | | | | Merge remote-tracking branch 'aosp/upstream' into master am: d8000d21a9 am: ↵Colin Cross2019-03-053-18/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8954814fb5 am: 8d7c363c12 Change-Id: Ia645d5f450d1983945ca4536142c2f78db58475f
| * | | | Merge remote-tracking branch 'aosp/upstream' into master am: d8000d21a9Colin Cross2019-03-053-18/+40
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8954814fb5 Change-Id: I02af9bbf9959d0aeac0bc6021acd52f96e4c51e3
| | * | | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-03-053-18/+40
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: d8000d21a9 Change-Id: I910f58b12fb5e8b3b08dcc207541c9ab10233bdb
| | | * | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-03-033-18/+40
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Add more OtherModule* methods Run go 1.11 and go 1.12 in travis Support go 1.12 Test: m checkbuild Change-Id: I9ed244b6c1a928590fb8220fb00cc8b1d4ef8c60
| | | | * Merge pull request #240 from colincross/other_modulecolincross2019-03-031-0/+26
| | | | |\ | | | | | | | | | | | | Add more OtherModule* methods
| | | | | * Add more OtherModule* methodsColin Cross2019-03-011-0/+26
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add OtherModuleDir, OtherModuleSubDir, and OtherModuleType to ModuleContext and TopDownMutatorContext, and add ModuleType to BaseModuleContext. Change-Id: If5c873a2620ef10333c0bdba5ab89d4256e5fdf2
| | | | * Merge pull request #239 from colincross/go1.12colincross2019-02-282-18/+14
| | | | |\ | | | | | | | | | | | | Support go 1.12
| | | | | * Run go 1.11 and go 1.12 in travisColin Cross2019-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8d53ca83fb97cc6b68e3e5f4025119bb3ea2502
| | | | | * Support go 1.12Colin Cross2019-02-281-18/+12
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | go 1.12 changed the stack trace of a function call during global variable initialization to contain a function called "PKG.init.ializers". Fix callerName to split the package path and function name on the first "." after the last "/", and look for functions called "init.ializers" or functions with the prefix "init." Change-Id: Ic2190837a8c4cde075f727bd69dd18d517a0ebc0
* | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 2a80a36834 am: ↵Colin Cross2019-03-042-21/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34c5c48468 am: 065ac47e03 Change-Id: I66e1a1185d9974800db097298cfe2443759d2193
| * | | | Merge remote-tracking branch 'aosp/upstream' into master am: 2a80a36834Colin Cross2019-03-042-21/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 34c5c48468 Change-Id: I287b6dc9adf222e528bbb7489285fa34422e3929
| | * | | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-03-042-21/+42
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2a80a36834 Change-Id: Icae8e6316a18cfb42da278008e77f8d5c86e42e3
| | | * | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-02-282-21/+42
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Replace *Escape with *EscapeList Test: m checkbuild Change-Id: I29a36d6ced9d5a97a123df7f85448e89cdc980ab
| | | | * Merge pull request #219 from colincross/escape_listcolincross2019-02-282-21/+42
| | | | |\ | | | | | | | | | | | | Replace *Escape with *EscapeList
| | | | | * Replace *Escape with *EscapeListColin Cross2018-09-192-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NinjaEscape and ShellEscape operated on lists, which led to awkward NinjaEscape([]string{s})[0]. Replace NinjaEscape and ShellEscape with NinjaEscapeList and ShellEscapeList, and add new NinjaEscape and ShellEscape functions that operate on a string. Test: m checkbuild Change-Id: I283d92cdddc8e0066a300015863a3eab66f77c23
* | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 2255c706d4 am: ↵Alex Light2019-02-283-4/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cb211b3ce am: 014bc227c4 Change-Id: I5d0a51ebfa6fbc8cf62a8c3d3b6d17fd4d009508
| * | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 2255c706d4Alex Light2019-02-283-4/+35
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8cb211b3ce Change-Id: Icca1ffeecb7b7b7d944cf4bf20ba86d07f37292d
| | * | | | Merge remote-tracking branch 'aosp/upstream' into masterAlex Light2019-02-283-4/+35
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2255c706d4 Change-Id: I5c58efe3c8a7e085882b18a08647eea74f7b1f24
| | | * | | Merge remote-tracking branch 'aosp/upstream' into masterAlex Light2019-02-283-4/+35
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: GetDirectDepWithTag needs to check all tags before panicing Allow Context to query Singletons Test: Manual Bug: 124507633 Bug: 125933724 Change-Id: If0a51961133a7dcbe7c779220130a203bcabed70
| | | | * | Merge pull request #238 from allight/rebase-add-java-servicescolincross2019-02-271-4/+8
| | | | |\ \ | | | | | | | | | | | | | | GetDirectDepWithTag needs to check all tags before panicing
| | | | | * | GetDirectDepWithTag needs to check all tags before panicingAlex Light2019-02-271-4/+8
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetDirectDeWithTag would panic if the first possible directDep did not have the correct tag. It should check to see if any version of that dependency has the right tag. Test: atest CtsJdwpTunnelHostTestCases Bug: 124507633 Bug: 125933724 Change-Id: I00d269130e9f136a93fd30c58b8fd929372d5b37
| | | | * | Merge pull request #237 from colincross/singletoncolincross2019-02-262-0/+27
| | | | |\ \ | | | | | | | | | | | | | | Allow Context to query Singletons
| | | | | * | Allow Context to query SingletonsColin Cross2019-02-262-0/+27
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Context.Singletons and Context.SingletonName to allow primary builders to query Singletons returned by all registered SingletonFactories. Change-Id: Iee85643dd47f7472e6bb5ae8004374bd6ea0419e