Commit graph

61002 commits

Author SHA1 Message Date
Paul Scovanner
f29dd68f61 Update Security String to 2020-08-05 am: d4b7f4de4b am: fff4e1f5a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11826025

Change-Id: Idf56ba322e87a6c2e06205d60b4e5bfa5d866ee7
2020-06-10 21:07:31 +00:00
Paul Scovanner
fff4e1f5a4 Update Security String to 2020-08-05 am: d4b7f4de4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11826025

Change-Id: I79b57da2c0387b33868dd36d3881d1d9ee3801b7
2020-06-10 21:01:31 +00:00
Elliott Hughes
71e9c32390 Merge "Remove TARGET_PREFER_32_BIT." am: 9df45f6ec2 am: 534b035e29
Original change: https://android-review.googlesource.com/c/platform/build/+/1288989

Change-Id: Ib72e06fd5b674606403bee352d3ddbd93d7430c7
2020-06-10 18:36:54 +00:00
Paul Scovanner
d4b7f4de4b Update Security String to 2020-08-05
Bug: 158587413
Change-Id: I5f0b271fb5302e8c72024b49fb1a2ae5120821e0
2020-06-10 18:35:18 +00:00
Elliott Hughes
534b035e29 Merge "Remove TARGET_PREFER_32_BIT." am: 9df45f6ec2
Original change: https://android-review.googlesource.com/c/platform/build/+/1288989

Change-Id: I4013f3521f2a6ee554412bdea45005d204c62a72
2020-06-10 18:25:42 +00:00
Elliott Hughes
9df45f6ec2 Merge "Remove TARGET_PREFER_32_BIT." 2020-06-10 18:07:06 +00:00
Paul Scovanner
949a33b139 Update Security String to 2020-08-01 am: a4d5641a34 am: a26a678246
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11812416

Change-Id: I4c13a2a555ff3ec3c16fd44f4e6667765738fc15
2020-06-10 17:07:34 +00:00
Paul Scovanner
a26a678246 Update Security String to 2020-08-01 am: a4d5641a34
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11812416

Change-Id: Ic81f52a8bea6a2cba37f62ae00f42a8a130cf1b4
2020-06-10 16:56:15 +00:00
Treehugger Robot
4c7dc6e511 Merge "base_rules.mk optimizations" am: 8add8cb145 am: ffbee4fbf3
Original change: https://android-review.googlesource.com/c/platform/build/+/1326240

Change-Id: Idd897d57865e3834d3fcd8fb7788b7a2a75e3e1e
2020-06-10 02:53:43 +00:00
Yo Chiang
d84cd89894 Merge "Cleanup unused get-32-bit-modules" am: 988693fb00 am: 6875feaf06
Original change: https://android-review.googlesource.com/c/platform/build/+/1307156

Change-Id: I898fb6454fef8fddac8b467c9ccc14a2dfb25611
2020-06-10 02:53:34 +00:00
Treehugger Robot
ffbee4fbf3 Merge "base_rules.mk optimizations" am: 8add8cb145
Original change: https://android-review.googlesource.com/c/platform/build/+/1326240

Change-Id: Ia6260f3c2d9c536c33adbad9d48a37295f45235d
2020-06-10 02:48:48 +00:00
Treehugger Robot
8add8cb145 Merge "base_rules.mk optimizations" 2020-06-10 02:46:12 +00:00
Yo Chiang
6875feaf06 Merge "Cleanup unused get-32-bit-modules" am: 988693fb00
Original change: https://android-review.googlesource.com/c/platform/build/+/1307156

Change-Id: Idbd15eff972a94ec61fafb2603fee94b27cf9583
2020-06-10 02:41:14 +00:00
Yo Chiang
988693fb00 Merge "Cleanup unused get-32-bit-modules" 2020-06-10 02:30:24 +00:00
Paul Scovanner
a4d5641a34 Update Security String to 2020-08-01
Bug: 158587413
Change-Id: I21b16ed52ef9c7c26a671692c66b06855b147b16
2020-06-09 19:41:58 +00:00
Dan Willemsen
8447b8116a base_rules.mk optimizations
A few more misc improvements that I found while analyzing the
performance of base_rules.mk.

This brings an aosp-master/aosp_crosshatch-userdebug kati run from 33.3s
to 28.6s

Bug: 158488548
Test: build-aosp_crosshatch.ninja is the same before/after
Change-Id: If99c31cc7b5d7133d70eb644c6095f19060b71e5
2020-06-09 09:59:24 -07:00
TreeHugger Robot
56dc12d42a [automerger skipped] Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev am: 7a726856a9 -s ours
am skip reason: Change-Id Icc52500cfc0a555e11d1a467b2da0649c7f5d31f with SHA-1 581be147c7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11733840

Change-Id: I235b240fb2b93f1db914fdd348f803ed8a02b079
2020-06-09 11:27:23 +00:00
TreeHugger Robot
7a726856a9 Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev 2020-06-09 11:14:45 +00:00
Dario Freni
f3c2823040 Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp 2020-06-09 10:02:19 +00:00
Treehugger Robot
02dcbdb3f9 Merge "More performance improvements" am: 1d1bb3b94f am: 27d4463cf5
Original change: https://android-review.googlesource.com/c/platform/build/+/1326018

Change-Id: Ic783c75beffd9eac7abb208d2f2697f8c4775325
2020-06-09 05:00:29 +00:00
Treehugger Robot
27d4463cf5 Merge "More performance improvements" am: 1d1bb3b94f
Original change: https://android-review.googlesource.com/c/platform/build/+/1326018

Change-Id: Ic7187f5a94fab73d6689326b3517c83db1a16487
2020-06-09 04:47:27 +00:00
Treehugger Robot
1d1bb3b94f Merge "More performance improvements" 2020-06-09 04:36:32 +00:00
Yo Chiang
1e55e74acc Cleanup unused get-32-bit-modules
These are no longer used by anyone:
* get-32-bit-modules
* get-32-bit-modules-if-we-can
* get-host-32-bit-modules
* get-host-32-bit-modules-if-we-can

Bug: 155869107
Test: TH
Change-Id: I441de7f94061efd40186b80d1a2ead11669a5753
2020-06-09 03:28:26 +00:00
Dan Willemsen
fd1e67b8ce More performance improvements
Instead of using `x := $(x) foo`, make sure `x` is initialized first,
then use `x += foo`.

For a aosp-master/aosp_crosshatch-userdebug build, this takes the build
from 49s to 33s (no significant difference in peak memory)

Bug: 158488548
Test: build-aosp_crosshatch.ninja is the same before/after
Change-Id: I41fb7611030dd3ba824f896a9c9eadbdd218f464
2020-06-08 19:10:23 -07:00
Treehugger Robot
b17e2f5004 Merge "Rewrite test data logic to make it faster" am: 83e9cfe291 am: 84849aef8e
Original change: https://android-review.googlesource.com/c/platform/build/+/1326014

Change-Id: Ic366d30d42dc8d7a188f395a8c4cfb71ac32a411
2020-06-09 01:37:17 +00:00
Treehugger Robot
84849aef8e Merge "Rewrite test data logic to make it faster" am: 83e9cfe291
Original change: https://android-review.googlesource.com/c/platform/build/+/1326014

Change-Id: I1ef75ceda67b8735217fe69af81e6b9d1481894e
2020-06-09 01:15:26 +00:00
Treehugger Robot
83e9cfe291 Merge "Rewrite test data logic to make it faster" 2020-06-09 01:00:52 +00:00
Elliott Hughes
9b824d5ceb Remove TARGET_PREFER_32_BIT.
Bug: https://issuetracker.google.com/138812821
Test: builds
Change-Id: I2ff7793c8b1eb56f6be63375cc7b70aa44254443
2020-06-08 16:36:52 -07:00
Josh Gao
761d53fb41 Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722

Change-Id: I9066c6ea5fe70760f08a448c5ec1cc6b925c6a5f
2020-06-08 23:23:40 +00:00
Dario Freni
581be147c7 Use APK CtsShim prebuilts for flattened apex.
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
2020-06-08 21:49:57 +00:00
Frank Feng
3608641667 Merge "Add test config template for sh_test." am: e4d2ccee92 am: 833cd90432
Original change: https://android-review.googlesource.com/c/platform/build/+/1323217

Change-Id: I66e47508ebbfef65c7b8a67787a7eb11fd30838b
2020-06-08 21:31:52 +00:00
Josh Gao
0336f08679 Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f am: 821ecd2b56
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454

Change-Id: I0838c25e56d9d71186162c5d3518a2a857bfdd96
2020-06-08 21:31:28 +00:00
Frank Feng
833cd90432 Merge "Add test config template for sh_test." am: e4d2ccee92
Original change: https://android-review.googlesource.com/c/platform/build/+/1323217

Change-Id: Ic324a02e64c6197761b446d234eee383804856af
2020-06-08 21:17:04 +00:00
Josh Gao
821ecd2b56 Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454

Change-Id: I415516a3575923a1b920b997d25541ccfb97ed0d
2020-06-08 21:16:39 +00:00
Steve Muckle
d1f15422d2 [automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38 -s ours
am skip reason: Change-Id I797addce760f4886166efa283302a53783581625 with SHA-1 950d723b9d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11764809

Change-Id: I3471f51d47eb3523ada85e83bcae30168df68579
2020-06-08 21:09:53 +00:00
Josh Gao
76e974567c Rename adbd_system_binaries to adbd_system_api.
This is going to include libraries as well, so rename to reflect this.

Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
(cherry picked from commit 67e0295833)
2020-06-08 14:07:02 -07:00
Frank Feng
e4d2ccee92 Merge "Add test config template for sh_test." 2020-06-08 21:05:31 +00:00
Josh Gao
581e1f4f1f Merge "Rename adbd_system_binaries to adbd_system_api." 2020-06-08 21:00:19 +00:00
Dario Freni
b586dba65a Use APK CtsShim prebuilts for flattened apex.
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
2020-06-08 18:44:52 +00:00
Dan Willemsen
c5ec8e95bc Rewrite test data logic to make it faster
It turns out we have a few tests with thousands of test data files,
which this logic does not handle very well. Just switching from `x :=
$(x) ...` to `x += ...` accomplishes the majority of these gains, but I
rewrote the logic to be less function-call+eval based to hopefully make
it easier to understand.

For an aosp-master/aosp_coral-eng build, this brings the time spent in
this logic from 7.6s to 0.3s (total kati runtime of 54s to 46s). Kati's
peak memory use (maxrss) also shrunk from 6.1GB to 3.8GB.

Bug: 158488548
Test: build-aosp_coral.ninja is the same before/after
Change-Id: Ia2ec8b29b5c1dd12fa7ea10b4f80fe802c692725
2020-06-08 11:42:51 -07:00
Treehugger Robot
05048d976c Merge changes I53c05800,Ic218283b am: 470cfbe8d7 am: 21805afbc6
Original change: https://android-review.googlesource.com/c/platform/build/+/1317599

Change-Id: I7c7f317cca241af3f8822617d1367a5a2acb25b5
2020-06-08 16:21:45 +00:00
Jiyong Park
10e44533bc Merge changes I4d88733c,I61943476,Ibed9c96d am: c844de4241 am: 82d6dd6061
Original change: https://android-review.googlesource.com/c/platform/build/+/1317597

Change-Id: I1bb5bdf9d5dae7fe0455f517f6347d442d191440
2020-06-08 16:21:22 +00:00
Jiyong Park
70dead438d [automerger skipped] Partial cherry-pick of ag/10260813 am: 9ebefc640d am: 9f2e9e1a7f -s ours
am skip reason: Change-Id Iaeefb35137de01c6ea57115d8830dd9bc30eccba with SHA-1 25648e60b2 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1317600

Change-Id: Ia2aa2a977a2fa943ae422a1594860f2b80838c34
2020-06-08 16:21:19 +00:00
Jiyong Park
fe7df0a0a7 <partition>/build.prop rules are defined using macro am: e28fa80e12 am: 236859d234
Original change: https://android-review.googlesource.com/c/platform/build/+/1317596

Change-Id: I4f05b3376ab6621787dd540f53ad851dff6194a3
2020-06-08 16:21:17 +00:00
Treehugger Robot
6fd21ab0e9 Merge "fix spurious / on toplevel kernel module installations" am: 208689cca8 am: 3957e09d24
Original change: https://android-review.googlesource.com/c/platform/build/+/1324842

Change-Id: I54b61290b5072a7311898c13cb4d60a2974413e9
2020-06-08 16:20:24 +00:00
Xin Li
6ba28f6af8 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 6e30a3fc86 -s ours am: 90325f7f73 -s ours
am skip reason: Change-Id I216989b052070e9f84bf1fa0f9ecc4724db50418 with SHA-1 0208ce535d is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1323218

Change-Id: I6d80a423088df9b03c6fdce8cbdbcdd1c50e04de
2020-06-08 16:07:56 +00:00
Treehugger Robot
21805afbc6 Merge changes I53c05800,Ic218283b am: 470cfbe8d7
Original change: https://android-review.googlesource.com/c/platform/build/+/1317599

Change-Id: I1faab74b423476911d49560560789863c1ffe105
2020-06-08 16:06:22 +00:00
Jiyong Park
82d6dd6061 Merge changes I4d88733c,I61943476,Ibed9c96d am: c844de4241
Original change: https://android-review.googlesource.com/c/platform/build/+/1317597

Change-Id: I7057509d5bd3006a8dad1abb651ca473c06b5a57
2020-06-08 16:04:57 +00:00
Jiyong Park
9f2e9e1a7f Partial cherry-pick of ag/10260813 am: 9ebefc640d
Original change: https://android-review.googlesource.com/c/platform/build/+/1317600

Change-Id: I4f8bfd258c2888818f4c5eea4c03b863c5bfb719
2020-06-08 16:04:55 +00:00
Jiyong Park
236859d234 <partition>/build.prop rules are defined using macro am: e28fa80e12
Original change: https://android-review.googlesource.com/c/platform/build/+/1317596

Change-Id: I6e5bd7a93c6e7fe0e45ca5befb2f110bfb40c4e1
2020-06-08 16:04:52 +00:00