aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 5044688 from d019345012951498cda181caed55908f7fe4f801 to ↵android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot2018-10-021-2/+2
|\ | | | | | | | | | | pi-qpr2-release Change-Id: I9ff9646d6c8e32350523590b37b91de6854ed3a0
| * [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ↵android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-b4s4-devJP Sugarbroad2018-09-071-2/+2
|/| | | | | | | | | | | | | | | am: 7f45c35f91 am: 52f19a1dd5 am: d339032ec9 am: d5bc270755 am: d04a70ea7f am: 23b67dc9ed am: 181207ea02 Change-Id: I0596c104bafc534af0989eca266fcd8b006adf1c
| * [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ↵JP Sugarbroad2018-09-071-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | am: 7f45c35f91 am: 52f19a1dd5 am: d339032ec9 am: d5bc270755 am: d04a70ea7f am: 23b67dc9ed Change-Id: Ic085da4146908f6e9df35dd99121f8788d876049
| | * [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ↵JP Sugarbroad2018-09-071-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f45c35f91 am: 52f19a1dd5 am: d339032ec9 am: d5bc270755 am: d04a70ea7f Change-Id: Ifa953b35864178b461bfa59e5428f0a287ea9541
| | | * [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ↵Android Build Merger (Role)2018-08-281-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f45c35f91 am: 52f19a1dd5 am: d339032ec9 am: d5bc270755 Change-Id: I68e354e73d2c13531d845ddb34f0e3252bb95497
| | | | * [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ↵Android Build Merger (Role)2018-08-281-2/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f45c35f91 am: 52f19a1dd5 am: d339032ec9 Change-Id: I245bb5b2978a8eba6998394839c4a08f97d7203e
| | | | | * [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ↵Android Build Merger (Role)2018-08-281-2/+2
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f45c35f91 am: 52f19a1dd5 Change-Id: I43f6acc2b8cb273f355417d0b6fb2bb58266c525
| | | | | * [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ↵Android Build Merger (Role)2018-08-281-2/+2
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f45c35f91 Change-Id: Ibde559feccdf67ff6cb56704d5d4e6c16342e9ad
| | | | | * [automerger] Support git submodules in version.cc generation. am: 3b166ce40aAndroid Build Merger (Role)2018-08-281-2/+2
| | | | |/| | | | | | | | | | | | | | | | | | | Change-Id: I5f099dca2eade782bb64f05cd4f3c2791a60e51e
| | | | | * Support git submodules in version.cc generation.JP Sugarbroad2018-08-281-2/+2
| | | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 109817231 Change-Id: I52520c01ee0e2ff452ef12e7fd49ee287d6cb369
* | | | | Merge remote-tracking branch 'aosp/upstream' into master am: ac70a73c81 am: ↵android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devDan Willemsen2018-02-285-3/+95
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1e982d803 am: 1e0a27120f Change-Id: Ic21f2f0b53d2641cea9f802869b733c70794e5c7
| * \ \ \ \ Merge remote-tracking branch 'aosp/upstream' into master am: ac70a73c81Dan Willemsen2018-02-285-3/+95
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f1e982d803 Change-Id: Ic9c3a7a80c6e6eb9510f25f6323a1168fc9d219d
| | * \ \ \ \ Merge remote-tracking branch 'aosp/upstream' into masterDan Willemsen2018-02-275-3/+95
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ac70a73c81 Change-Id: Id4fbb2fd248859dfad492e65cf5f876aa56ba233
| | | * \ \ \ \ Merge remote-tracking branch 'aosp/upstream' into masterandroid-wear-p-preview-2android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Dan Willemsen2018-02-275-3/+95
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Add KATI_(deprecate|obsolete)_export Bug: 73959648 Test: upstream tests Test: add $(KATI_deprecate_export msg) to config.mk Change-Id: Ie0712b21342384de2f8afd17c866743e9eb50118
| | | | * \ \ \ \ Merge pull request #135 from danw/deprecate_exportDan Willemsen2018-02-275-3/+95
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add KATI_(deprecate|obsolete)_export
| | | | | * | | | | Add KATI_(deprecate|obsolete)_exportDan Willemsen2018-02-275-3/+95
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow makefiles to mark the `export` and `unexport` keywords as deprecated or obsolete. In large builds like Android, we've got our own ways to set global environment variables, it's very unlikely that individual makefiles need to set an environment variable for every single rule. We expect to eventually add environment variables to the list of inputs that ninja checks to see if a command needs to run again (currently it just checks the timestamps and commandline). Reducing the ability for makefiles to export global variables per-configuration means that we're more likely to share compile steps between configurations. Change-Id: I8df0630ef264e39fd077b08dcac57e571ebe214f
* | | | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 0f3785677c am: ↵Dan Willemsen2018-02-162-7/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1dc3ba339a am: f918bb964e Change-Id: I0e6b299698328bd11dee81becd5a892561b1394c
| * | | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 0f3785677cDan Willemsen2018-02-162-7/+34
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1dc3ba339a Change-Id: I4386982c28fd1a58abbdaef42bfc4a2a5e99403f
| | * | | | | | | Merge remote-tracking branch 'aosp/upstream' into masterDan Willemsen2018-02-162-7/+34
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0f3785677c Change-Id: I0839898a36559e0f5bb4782d63c5468c65bd9f2b
| | | * | | | | | Merge remote-tracking branch 'aosp/upstream' into masterDan Willemsen2018-02-152-7/+34
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Fail find parsing for \* Bug: 73143444 Test: ckati_tests/find_test (part of build-prebuilts.sh now) Test: Manually check failing find commands on AOSP Change-Id: I18497e20bc8788cbe2a38845102537ab241d1d52
| | | | * | | | | Merge pull request #133 from danw/find_unescapeDan Willemsen2018-02-152-7/+34
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fail find parsing for \*
| | | | | * | | | | Fail find parsing for \*Dan Willemsen2018-02-132-7/+34
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android hit a few cases where we were searching for *.pyc or verifiedboot*, and escaping the * as \*. In most cases the entire argument was just quoted instead. Kati understands and handles the quotes just fine, but it didn't realize that \* was special, so it was searching for files that started with a literal '\'. We have no good way of freeing allocated memory in the find parser, so just support stripping a leading \ (\*.pyc works, along with '\('), and fall back to the system find if another \ is found in a token.
* | | | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 398aa879e9 am: ↵Dan Willemsen2018-02-082-6/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e14ea3ab0b am: e5288b11fc Change-Id: I4d23dbca3573e98b369d897f257e00af7ad66894
| * | | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 398aa879e9Dan Willemsen2018-02-082-6/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e14ea3ab0b Change-Id: I01567d063632dbaf8809d227a686fa2b4619ebe2
| | * | | | | | | Merge remote-tracking branch 'aosp/upstream' into masterDan Willemsen2018-02-082-6/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 398aa879e9 Change-Id: Id3345d4e46e010cee3f21a2cc633408a32009e72
| | | * | | | | | Merge remote-tracking branch 'aosp/upstream' into masterDan Willemsen2018-02-072-6/+11
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Support the implicit "-a" in find Test: OUT_DIR=out DIST_DIR=dist prebuilts/build-tools/build-prebuilts.sh Change-Id: Ia1bf168a3ee4c7c01d66a810cacf648ab42e6edd
| | | | * | | | | Merge pull request #132 from danw/find_implicit_andDan Willemsen2018-02-072-6/+11
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Support the implicit "-a" in find
| | | | | * | | | | Support the implicit "-a" in findDan Willemsen2018-02-062-6/+11
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The find man page says that "expression expression" is equivalent to "expression -a expression". This reduces the number of shell commands we need to run during regen check of one of the internal android trees by ~10%, which reduced the time spent in regen checking by ~60%. before: *kati*: shell time (regen): 5.842119 / 516 after: *kati*: shell time (regen): 2.377083 / 462 Change-Id: I177f37cd7e12625fb2dbfa371f3d79cb625c84fe
* | | | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 223a86e1a1 am: ↵Dan Willemsen2018-02-013-5/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 789deaf978 am: 4f6feb3cc2 Change-Id: I32e5c4accd0eb2317e3ebc3400d0a075d397997c
| * | | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 223a86e1a1Dan Willemsen2018-02-013-5/+30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 789deaf978 Change-Id: Iebfb339afd2341d2542ab5b031c17fc0d7134d60
| | * | | | | | | Merge remote-tracking branch 'aosp/upstream' into masterDan Willemsen2018-02-013-5/+30
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 223a86e1a1 Change-Id: I06dbdde3b1899ea784996541bd8bdfac86dd47d8
| | | * | | | | | Merge remote-tracking branch 'aosp/upstream' into masterDan Willemsen2018-01-313-5/+30
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Dump the top 10 slowest $(shell) calls Support different findleaves.py path Test: OUT_DIR=out DIST_DIR=dist prebuilts/build-tools/build-prebuilts.sh Test: m nothing; check out/soong.log Change-Id: Ic79c6e2b3aa49ee5ce598f31a1b03879bd960284
| | | | * | | | | Merge pull request #131 from danw/find_perfShinichiro Hamaji2018-02-013-5/+30
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Find emulator performance fixes / debugging
| | | | | * | | | | Dump the top 10 slowest $(shell) callsDan Willemsen2018-01-312-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if these are <3 seconds (the limit for printing immediately), these can add up. Keep a map, then dump the slowest 10 commands when we dump the total stats.
| | | | | * | | | | Support different findleaves.py pathDan Willemsen2018-01-311-2/+4
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In newer android trees, build/tools is a symlink to build/make/tools, and we've started referring to build/make/tools/findleaves.py instead of build/tools/findleaves.py. Accept either for purposes of the find emulator. Change-Id: I3ce66ed3806bff3549a61e85652283bd6f30dc2e
* | | | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: cfcaaa2511 am: ↵Dan Willemsen2017-12-284-2/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b725566ad am: bbf8df0cb5 Change-Id: I2af8061c5723b00edf04a314286daaed15b89fa0
| * | | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: cfcaaa2511Dan Willemsen2017-12-284-2/+34
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1b725566ad Change-Id: Ia16a73aa411c289e39addbaae6785c34871be10e
| | * | | | | | | Merge remote-tracking branch 'aosp/upstream' into masterDan Willemsen2017-12-284-2/+34
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cfcaaa2511 Change-Id: I31c04a9b5c79385fd497914934a82c0c750bae74
| | | * | | | | | Merge remote-tracking branch 'aosp/upstream' into masterandroid-wear-8.0.0_r1Dan Willemsen2017-12-284-2/+34
| | |/| | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Expand PeekVar to KATI_(deprecated|obsolete)_var Test: ckati_stamp_dump --env out/.kati_stamp-aosp_arm64; check for PATH Change-Id: I4add3df322c2ac7058c543e8d347eb85a5d4353d
| | | * | | | | Merge pull request #130 from danw/obsolete_envShinichiro Hamaji2017-12-284-2/+34
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Expand PeekVar to KATI_(deprecated|obsolete)_var
| | | | * | | | | Expand PeekVar to KATI_(deprecated|obsolete)_varDan Willemsen2017-12-274-2/+34
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that marking a variable as deprecated or obsolete does not cause the variable to be inserted into the used environment table.
* | | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 4d0441d470 am: 824a4f395dDan Willemsen2017-11-228-8/+105
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8450fb27d0 Change-Id: I2510c904baad63d1f72758be43b354e60de826e4
| * | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 4d0441d470Dan Willemsen2017-11-228-8/+105
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 824a4f395d Change-Id: I3d799eaf97f192c389cc38598f6388f68b7f09fc
| | * | | | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2017-11-228-8/+105
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4d0441d470 Change-Id: Iee69cf9aa8ad6a08d5832a46cc244626760b2262
| | * | | | | | Merge remote-tracking branch 'aosp/upstream'android-o-mr1-iot-preview-6o-mr1-iot-preview-6Dan Willemsen2017-11-228-8/+105
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aosp/upstream: Add environment dumping to regen_dump Fix list of used environment variables Test: upstream tests Test: prebuilts/build-tools/build-prebuilts.sh Test: `m nothing` on internal master, inspect stamp Change-Id: Ifd30374b3a0d820b7c5700a97ddd4e5fcfabbfce
| | | * | | | | Merge pull request #129 from danw/envDan Willemsen2017-11-218-8/+105
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix list of used environment variables
| | | | * | | | | Add environment dumping to regen_dumpDan Willemsen2017-11-211-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To aid with local debugging.
| | | | * | | | | Fix list of used environment variablesDan Willemsen2017-11-217-5/+57
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the introduction of deprecated / obsolete variable support, we started calling LookupVarInLocalScope on the variable we were setting with = or :=. This was fine, except it also marked those variables as used environment variables (whether they were set in the environment or not). So changing one of these environment variables would cause kati to regenerate the ninja file even though nothing would change. To fix this, add new Peek* functions that don't record the variables as used, but can still be used to check to see if the variable has been deprecated or is obsolete.
* | | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 3c89f197a6 am: 330fd37d4e ↵Dan Willemsen2017-10-1550-915/+1044
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b5eeb9ed39 am: 4ef2ff2ff6 Change-Id: If1f41320a4e0267fe654bf16e50de3fc2d6f7b17
| * | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 3c89f197a6 am: 330fd37d4eDan Willemsen2017-10-1550-915/+1044
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b5eeb9ed39 Change-Id: Ibad792b9f826f43bb6a316b8c8aa0aaa121c8988
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-04 11:12:34 +0000