Dan Willemsen
5fc6bb9a57
Merge "Skip much of aux_config.mk" am: d052fd3bdc
...
am: 30fb5cdce9
Change-Id: I180070a0c53351f0965cdfcc7b7a54f57ae75dc2
2019-08-27 01:26:24 -07:00
Dan Willemsen
30fb5cdce9
Merge "Skip much of aux_config.mk"
...
am: d052fd3bdc
Change-Id: I75affb9b394859fae85e10bf2210e5246834aebe
2019-08-27 01:20:25 -07:00
Baligh Uddin
a7a4f1200b
DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d
am: f518748b2b
...
am: fd39c26b39
Change-Id: I8374b6d32f5e2bef3bee62ecd3ec6bc036e62626
2019-08-27 01:12:54 -07:00
Treehugger Robot
d052fd3bdc
Merge "Skip much of aux_config.mk"
2019-08-27 08:08:28 +00:00
Dan Willemsen
46a88893b1
More base_rules.mk optimizations
...
This saves another 5-15% of makefile eval time (depending on
target/branch).
I'm not sure if deps-license is still used at all, but we'll only save
the information for it if it's actually going to run now.
Since the default module tag is "optional", we really don't need to save
a list of most modules in another variable. I don't see anything that
really needs to see the list of optional modules.
Test: treehugger
Change-Id: Iaf54e9932fbe8e61f10bd0c9336fc4fdefea27ab
2019-08-27 00:49:31 -07:00
Baligh Uddin
fd39c26b39
DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d
...
am: f518748b2b
Change-Id: I349111540e765af64cdd0f915819e2a290c01ea1
2019-08-27 00:34:56 -07:00
Dan Willemsen
2abf159f9b
Improve performance (don't filter ALL_MODULES)
...
It turns out that this single line was responsible for 28-44% of the
time we spent parsing makefiles. So instead of filtering across
$(ALL_MODULES), check to see if a variable that we always would set is
set.
Test: treehugger
Test: check kati-build eval time before/after
Change-Id: I946c2efd060181a4ae9edd3409c53d9b49a58285
2019-08-26 23:25:17 -07:00
Dan Willemsen
9de012ebde
Skip much of aux_config.mk
...
This was showing up in the top-ten longest makefiles during the product
config and cleanspec kati runs sometimes, even though it's really never
used. So instead of running the sometimes-expensive find command, skip it
unless an AUX OS was specified.
At some point we should remove this entirely, but that's a larger change
that doesn't need to happen yet.
Test: build-aosp_arm.ninja is the same before/after
Change-Id: I0ea10193d2f07e1717224e9020a7defaf6191c05
2019-08-26 22:03:32 -07:00
Tao Bao
ac63a9d728
releasetools: Clean up img_from_target_files.py.
...
Bug: N/A
Test: Run img_from_target_files to generate an image archive.
Change-Id: I802640b88fe0c7a6d1aab63411b8194d61bceaba
2019-08-26 20:33:11 -07:00
Baligh Uddin
75590eef98
[automerger skipped] DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d
am: f9b610a29e
am: fb27ca6950
...
am: 65985516a1
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib1baf98da8cca6d89097dc7479da4a8c576d78f8
2019-08-26 19:26:44 -07:00
Baligh Uddin
29b37092a3
[automerger skipped] DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d
am: f518748b2b
am: e9dae1b5a2
...
am: 9b66e7eb16
-s ours
am skip reason: subject contains skip directive
Change-Id: Idac0c8f1201e809156f6a0fb2404364794406563
2019-08-26 19:11:16 -07:00
Baligh Uddin
65985516a1
DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d
am: f9b610a29e
...
am: fb27ca6950
Change-Id: I8ab8d80440080f5d3aad226842273dfc30e1b2b6
2019-08-26 18:37:51 -07:00
Baligh Uddin
9b66e7eb16
DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d
am: f518748b2b
...
am: e9dae1b5a2
Change-Id: If5945d5bdd1660615721d38ff7e39f999e24a1d1
2019-08-26 18:32:32 -07:00
Baligh Uddin
fb27ca6950
DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d
...
am: f9b610a29e
Change-Id: Ide14243db11ee888a198fa1ba29d6d709874e36e
2019-08-26 18:10:00 -07:00
Baligh Uddin
f9b610a29e
DO NOT MERGE - Add a guard against deleting AVB_PUBKey.
...
am: 39b8f9fc7d
Change-Id: I6dd1084e8a4a40ada0b3471ae660cea59dff76b6
2019-08-26 17:18:51 -07:00
Xin Li
31a67c3cca
[automerger skipped] Merge "DO NOT MERGE - Skip build QP1A.190711.020 in stage-aosp-master" into stage-aosp-master am: db1737d46a
-s ours am: 85942fafad
am: d323930617
...
am: 28b6fc0be8
-s ours
am skip reason: subject contains skip directive
Change-Id: Ief7b60d69a99aa18e2bb80d7516f7a90cb9b2056
2019-08-26 17:13:36 -07:00
Baligh Uddin
e9dae1b5a2
DO NOT MERGE - Add a guard against deleting AVB_PUBKey. am: 39b8f9fc7d
...
am: f518748b2b
Change-Id: If38cb263c748f82d61788bda8613564b11f709de
2019-08-26 17:11:46 -07:00
Baligh Uddin
f518748b2b
DO NOT MERGE - Add a guard against deleting AVB_PUBKey.
...
am: 39b8f9fc7d
Change-Id: Ic1f496af3c6f58a2d0aaf41244c59a22eb927d93
2019-08-26 16:59:25 -07:00
Dan Shi
00d4b4bcc4
Instrumentation test doesn't support extra config
...
Bug: none
Test: m -j FrameworksCorePackageManagerTests
confirm FrameworksCorePackageManagerTests.config doesn't have the
placeholder.
Change-Id: Ie16720fcf74490fddd1e282f8526e7161d6d10ce
2019-08-26 15:50:15 -07:00
Xin Li
28b6fc0be8
[automerger skipped] Merge "DO NOT MERGE - Skip build QP1A.190711.020 in stage-aosp-master" into stage-aosp-master am: db1737d46a
-s ours am: 85942fafad
...
am: d323930617
Change-Id: Ib2cab779ec114bdeeec8cb3bf0a79f4710914451
2019-08-26 15:22:16 -07:00
Daniel Mentz
c77c59f2d9
Merge "Consider search_path to locate avb_*_key_path files" am: 11dc247ba9
am: 1e8961033e
am: 8442059d9f
am: 8975c726fb
...
am: eb99954599
Change-Id: I55c8093d01881804f1cb4a9d2718bc5938650c37
2019-08-26 14:49:23 -07:00
Mathieu Chartier
d207aebdd5
[automerger skipped] Merge "Revamp nopreload configuration" am: bca3111cfa
am: 066f23b78a
am: a200fb7d45
am: d76b692563
...
am: 6cf820939c
-s ours
am skip reason: change_id I97a3a25c3094f84e130e02692b02832795ee6ef1 with SHA1 6f8fda4937
is in history
Change-Id: I30269aea93bf59be3233ee6049860c6bd6490f48
2019-08-26 14:24:19 -07:00
Baligh Uddin
651c7af5c0
Merge "Add a guard against deleting AVB_PUBKey." am: 667c1aa83d
am: 6fac8bab91
am: 8356e89977
am: 37f7212aae
...
am: 99ece6d3d7
Change-Id: I71d69589ef7d633139dea0565b4d73c6bc62352a
2019-08-26 14:00:30 -07:00
Xin Li
9d5516c697
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master" into stage-aosp-master am: 3db69e3a80
-s ours am: 8d0fd2300a
am: e8b8eb7be9
...
am: 51513ae02d
-s ours
am skip reason: subject contains skip directive
Change-Id: I5ba8b19ed1f30a27aadb2e12b7fa17a64044dce1
2019-08-26 13:56:46 -07:00
Daniel Mentz
eb99954599
Merge "Consider search_path to locate avb_*_key_path files" am: 11dc247ba9
am: 1e8961033e
am: 8442059d9f
...
am: 8975c726fb
Change-Id: I91dbffe71c1b6204a1986c0f9d4829414a207fcb
2019-08-26 13:35:07 -07:00
Xin Li
d323930617
[automerger skipped] Merge "DO NOT MERGE - Skip build QP1A.190711.020 in stage-aosp-master" into stage-aosp-master am: db1737d46a
-s ours
...
am: 85942fafad
Change-Id: I0f330ea12213444ff905606016e1514552ecf585
2019-08-26 13:30:39 -07:00
Mathieu Chartier
6cf820939c
Merge "Revamp nopreload configuration" am: bca3111cfa
am: 066f23b78a
am: a200fb7d45
...
am: d76b692563
Change-Id: I185b39ce2700f585fedb7d040928bc85012d085e
2019-08-26 13:20:03 -07:00
Xin Li
ac1867cb44
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: 8bd576e201
-s ours am: e77c2e6b26
am: b17dbd2074
...
am: 2019e0fe0b
-s ours
am skip reason: subject contains skip directive
Change-Id: I86d6db401e37a2f58b1d75b1b3520b4657c6aaf2
2019-08-26 13:15:29 -07:00
Xin Li
85942fafad
[automerger skipped] Merge "DO NOT MERGE - Skip build QP1A.190711.020 in stage-aosp-master" into stage-aosp-master
...
am: db1737d46a
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic936979ac1b78609cb95215810120b21939a7995
2019-08-26 13:15:24 -07:00
Amy Zhang
bf0fe4df46
[automerger skipped] Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729" am: e7f5833792
am: 2491b3ca91
am: 0adf54803a
am: f13ce3e10d
...
am: 4bc0df06a0
-s ours
am skip reason: change_id I6c8fa9382c64dc86f719fdfb17726fa694b6abb7 with SHA1 8a0ca3b503
is in history
Change-Id: Iec00e3f91ac8cd5bcdd67644c979b1baf2a32e14
2019-08-26 13:14:59 -07:00
Xin Li
a2230db278
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: 7887a5010d
-s ours am: efd33df284
am: ccd980402e
...
am: 4167117ad4
-s ours
am skip reason: subject contains skip directive
Change-Id: I3bd372cd320b12a35f02ac34bbdfce9ef00be697
2019-08-26 13:14:34 -07:00
Daniel Mentz
8975c726fb
Merge "Consider search_path to locate avb_*_key_path files" am: 11dc247ba9
am: 1e8961033e
...
am: 8442059d9f
Change-Id: Ic8325067f17696ee56fc4d2c2787b8bde6f0031d
2019-08-26 13:08:48 -07:00
Baligh Uddin
99ece6d3d7
Merge "Add a guard against deleting AVB_PUBKey." am: 667c1aa83d
am: 6fac8bab91
am: 8356e89977
...
am: 37f7212aae
Change-Id: Ifaf432fbed63563ca28a33b27aec9ceaa29dcf46
2019-08-26 12:58:57 -07:00
Daniel Mentz
8442059d9f
Merge "Consider search_path to locate avb_*_key_path files" am: 11dc247ba9
...
am: 1e8961033e
Change-Id: I1a93f474f069b6a573006602a27d9e0aaa4cc0c2
2019-08-26 12:57:47 -07:00
Xin Li
51513ae02d
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master" into stage-aosp-master am: 3db69e3a80
-s ours am: 8d0fd2300a
...
am: e8b8eb7be9
Change-Id: I0f22a53aae3ca766a16e5c4d3001ba44ad93b486
2019-08-26 12:54:45 -07:00
TreeHugger Robot
db1737d46a
Merge "DO NOT MERGE - Skip build QP1A.190711.020 in stage-aosp-master" into stage-aosp-master
2019-08-26 19:53:18 +00:00
Xin Li
49bfa9e4e7
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 7b4f1048e1
-s ours am: 8f61f780ac
am: 2d9d9dbf1b
...
am: a6b47240df
-s ours
am skip reason: subject contains skip directive
Change-Id: I25f93a613e6f43013e3eb4b677b8c4ff6f696625
2019-08-26 12:38:08 -07:00
Daniel Mentz
1e8961033e
Merge "Consider search_path to locate avb_*_key_path files"
...
am: 11dc247ba9
Change-Id: Ie0479fe88e37b330bc80fb6cb68d906546c70b0a
2019-08-26 12:21:24 -07:00
Xin Li
2019e0fe0b
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: 8bd576e201
-s ours am: e77c2e6b26
...
am: b17dbd2074
Change-Id: I1bf0ca41e05cdd3c1617cb7fc931040d47aac2bf
2019-08-26 12:12:54 -07:00
Amy Zhang
4bc0df06a0
Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729" am: e7f5833792
am: 2491b3ca91
am: 0adf54803a
...
am: f13ce3e10d
Change-Id: I0079006d6832305b24d5d38b57a793b3e196a149
2019-08-26 12:12:22 -07:00
Xin Li
4167117ad4
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: 7887a5010d
-s ours am: efd33df284
...
am: ccd980402e
Change-Id: I5744aea49c0273181fa79e260e5117a8df72f64d
2019-08-26 12:11:57 -07:00
Xin Li
11f4327038
DO NOT MERGE - Skip build QP1A.190711.020 in stage-aosp-master
...
Bug: 139893257
Change-Id: I2a5aab8575c187db85ed6197160779886ddd4340
2019-08-26 18:31:31 +00:00
Xin Li
a6b47240df
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 7b4f1048e1
-s ours am: 8f61f780ac
...
am: 2d9d9dbf1b
Change-Id: I0c73669bd51d087ca78b8d96e12d27b7c5bafaa9
2019-08-26 11:26:40 -07:00
Daniel Mentz
11dc247ba9
Merge "Consider search_path to locate avb_*_key_path files"
2019-08-26 18:17:29 +00:00
Daniel Mentz
25478181b9
Consider search_path to locate avb_*_key_path files
...
avb_*_key_path are usually relative file paths. If these files cannot be
located from the current directory, try prepending OPTIONS.search_path.
Bug: 139836256
Test: python -m unittest test_common
Test: python -m unittest test_add_img_to_target_files
Change-Id: I020b257f458a1f5762691d0499feaf4027e37126
2019-08-26 18:17:14 +00:00
Mathieu Chartier
d76b692563
Merge "Revamp nopreload configuration" am: bca3111cfa
am: 066f23b78a
...
am: a200fb7d45
Change-Id: Id5a7640534d3d41b471665c8f48142164b218e09
2019-08-26 09:38:56 -07:00
Mathieu Chartier
a200fb7d45
Merge "Revamp nopreload configuration" am: bca3111cfa
...
am: 066f23b78a
Change-Id: I8632581361d016b847cbe7d3b04126219e365364
2019-08-26 09:33:59 -07:00
Mathieu Chartier
066f23b78a
Merge "Revamp nopreload configuration"
...
am: bca3111cfa
Change-Id: I7f37c8fe0d97d2b8af44a0b11340480c156d2ac2
2019-08-26 09:27:02 -07:00
Mathieu Chartier
bca3111cfa
Merge "Revamp nopreload configuration"
2019-08-26 16:13:10 +00:00
Baligh Uddin
37f7212aae
Merge "Add a guard against deleting AVB_PUBKey." am: 667c1aa83d
am: 6fac8bab91
...
am: 8356e89977
Change-Id: Ic7d3612fb6a7f7dbf690c2edd3cf20945a2f4684
2019-08-25 22:28:29 -07:00