Jiyong Park
ad810b6dae
Organize product vars for adding properties
...
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.
PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.
PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.
For other partitions (odm, system_ext, product), there is no change.
Bug: 117892318
Test: m
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-09 22:52:56 +09:00
Dario Freni
400324101c
[automerger skipped] Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp am: f3c2823040
am: e93b598eb8
am: ae2159dbcf
-s ours
...
am skip reason: Change-Id Icc52500cfc0a555e11d1a467b2da0649c7f5d31f with SHA-1 e23fd86f1b
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11789975
Change-Id: I8e2dbb0adc95339ab04074ee559c152bb6b36ea4
2020-06-09 10:39:55 +00:00
Dario Freni
ae2159dbcf
Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp am: f3c2823040
am: e93b598eb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11789975
Change-Id: I0899451db34a4a24ed4c0c7c68ca7dc453645cf5
2020-06-09 10:27:46 +00:00
Dario Freni
e93b598eb8
Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp am: f3c2823040
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11789975
Change-Id: I68cbc12fd26caaa62a7d9860fed83aef46f1120c
2020-06-09 10:11:27 +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
12ae1d0de9
Merge "More performance improvements" am: 1d1bb3b94f
am: 27d4463cf5
am: 02dcbdb3f9
am: 373f5fad03
am: 0c5aef4d5b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326018
Change-Id: I0768584d75cbe5814670082b4940dedeff6d5392
2020-06-09 05:39:50 +00:00
Treehugger Robot
0c5aef4d5b
Merge "More performance improvements" am: 1d1bb3b94f
am: 27d4463cf5
am: 02dcbdb3f9
am: 373f5fad03
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326018
Change-Id: Ib436fd2204c09c0b935b87dc2030d38ce99e4cbe
2020-06-09 05:24:54 +00:00
Treehugger Robot
373f5fad03
Merge "More performance improvements" am: 1d1bb3b94f
am: 27d4463cf5
am: 02dcbdb3f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326018
Change-Id: Ic0fef9f2d8ddc33c4455e00021da278e41e1baa2
2020-06-09 05:13:00 +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
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
f3c94c9232
Merge "Rewrite test data logic to make it faster" am: 83e9cfe291
am: 84849aef8e
am: b17e2f5004
am: 7f82a0ca94
am: 23d1c73f8c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326014
Change-Id: I9a650e8d6e0a0ebf7e1bd051d75e97a4644bda20
2020-06-09 02:09:40 +00:00
Treehugger Robot
23d1c73f8c
Merge "Rewrite test data logic to make it faster" am: 83e9cfe291
am: 84849aef8e
am: b17e2f5004
am: 7f82a0ca94
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326014
Change-Id: I36f0a8b7f209aeac9dea469cb9589e286b5e92b1
2020-06-09 01:59:24 +00:00
Treehugger Robot
7f82a0ca94
Merge "Rewrite test data logic to make it faster" am: 83e9cfe291
am: 84849aef8e
am: b17e2f5004
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326014
Change-Id: Ic7c0ba13df561059e85feae83d7c56c9f20fb74c
2020-06-09 01:48:56 +00: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
Automerger Merge Worker
8a0866d488
Merge "Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: 761d53fb41" into rvc-d1-dev-plus-aosp am: e87d17e478
am: 281a3ea41b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: I7ad224837ef51212d827a0f2a29b855bbca2c3b1
2020-06-09 00:02:32 +00:00
Josh Gao
e63c24b01d
Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: c015c9079d
am: 6288632276
am: c4de1c4573
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: I98a235a1097c065620596ee55fc75be30f6ec582
2020-06-09 00:02:19 +00:00
Josh Gao
b55dc4398e
Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: c015c9079d
am: 5bfcc95ba1
am: 41c958730d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: I288dd44199f8ac90548af8a1942c0a1c4303eb20
2020-06-09 00:01:32 +00:00
Automerger Merge Worker
281a3ea41b
Merge "Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: 761d53fb41" into rvc-d1-dev-plus-aosp am: e87d17e478
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: I4ddda970de23b51c77008d4a0fe6c7f77824804d
2020-06-08 23:49:25 +00:00
Josh Gao
c4de1c4573
Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: c015c9079d
am: 6288632276
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: I7b3fa59b00bed6ce92c3d7487d0bc5a7a4e242cf
2020-06-08 23:49:01 +00:00
Josh Gao
41c958730d
Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: c015c9079d
am: 5bfcc95ba1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: I909541fa2fb3348f5c63e928883336d9cb952323
2020-06-08 23:48:48 +00:00
Automerger Merge Worker
e87d17e478
Merge "Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: 761d53fb41" into rvc-d1-dev-plus-aosp
2020-06-08 23:37:19 +00:00
Josh Gao
dab2e12aeb
Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: 761d53fb41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: Id7a243a29b4fa886467afdf5397353fc7a11b10e
2020-06-08 23:37:11 +00:00
Josh Gao
6288632276
Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: c015c9079d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: Ib078c34cc62a926cde1aec60784bd327b313b40d
2020-06-08 23:37:08 +00:00
Josh Gao
5bfcc95ba1
Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
am: c015c9079d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: I13a4a1f829f06560351540890601f71027c5db83
2020-06-08 23:37:04 +00: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
Josh Gao
c015c9079d
Rename adbd_system_binaries to adbd_system_api. am: 76e974567c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11795722
Change-Id: I90f830de334c76fc8d3308fcafe98d79f36a3764
2020-06-08 23:23:35 +00:00
Frank Feng
3b6584fd2e
Merge "Add test config template for sh_test." am: e4d2ccee92
am: 833cd90432
am: 3608641667
am: f2b2f51f3f
am: d2abfee869
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1323217
Change-Id: Id8470e6e0e13f762c530ea9188ab952aaff87375
2020-06-08 22:21:18 +00:00
Josh Gao
e1e0135aad
Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f
am: 821ecd2b56
am: 0336f08679
am: 2dcaca7c3a
am: 570df23fac
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454
Change-Id: Ifa31e514661c6d83b71ec8ee3b1be73441099165
2020-06-08 22:21:01 +00:00
Frank Feng
d2abfee869
Merge "Add test config template for sh_test." am: e4d2ccee92
am: 833cd90432
am: 3608641667
am: f2b2f51f3f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1323217
Change-Id: I79270759b59026f3b6c9f6da299541b29e9c49a1
2020-06-08 22:06:04 +00:00
Josh Gao
570df23fac
Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f
am: 821ecd2b56
am: 0336f08679
am: 2dcaca7c3a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454
Change-Id: I9604ecad5405e8dd9447d3d8fdf976852d53c635
2020-06-08 22:05:43 +00:00
Frank Feng
f2b2f51f3f
Merge "Add test config template for sh_test." am: e4d2ccee92
am: 833cd90432
am: 3608641667
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1323217
Change-Id: I1b3199d9b699b3065a2035e12aa09368dd4d2f6a
2020-06-08 21:52:48 +00:00
Automerger Merge Worker
364da64911
Merge "[automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38
am: 239258fbf5
am: 2a25ba9939
-s ours" into rvc-qpr-dev-plus-aosp am: b362748702
-s ours
...
am skip reason: Change-Id I797addce760f4886166efa283302a53783581625 with SHA-1 d03ec51f38
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11764809
Change-Id: Id2d2955da7b87dc8805144ea9cdf27845b614d12
2020-06-08 21:52:25 +00:00
Steve Muckle
7c43f51faf
[automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38
-s ours am: d1f15422d2
-s ours am: b46eb198d2
-s ours am: 34199ec5f9
-s ours
...
am skip reason: Change-Id I797addce760f4886166efa283302a53783581625 with SHA-1 d03ec51f38
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11764809
Change-Id: I85f29d0e680afb3287186404c44d6f5cd664c674
2020-06-08 21:52:18 +00:00
Josh Gao
2dcaca7c3a
Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f
am: 821ecd2b56
am: 0336f08679
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454
Change-Id: I555bc079230200f36c9eb1f1a93586464a93292c
2020-06-08 21:52:12 +00:00
Steve Muckle
eecefed45e
[automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38
am: 239258fbf5
-s ours am: ef6ff11466
-s ours am: 08ced9334d
-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: I9a8f64efbe6ada7815dea7cef37844b8894107dc
2020-06-08 21:52:10 +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
Automerger Merge Worker
b362748702
Merge "[automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38
am: 239258fbf5
am: 2a25ba9939
-s ours" into rvc-qpr-dev-plus-aosp
2020-06-08 21:36:15 +00:00
Steve Muckle
1e1b344af6
[automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38
am: 239258fbf5
am: 2a25ba9939
-s ours
...
am skip reason: Change-Id I797addce760f4886166efa283302a53783581625 with SHA-1 d03ec51f38
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11764809
Change-Id: Ibe76661a2d1a92bf15a7916eb0f456a0b8ad81b1
2020-06-08 21:36:09 +00:00
Steve Muckle
34199ec5f9
[automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38
-s ours am: d1f15422d2
-s ours am: b46eb198d2
-s ours
...
am skip reason: Change-Id I797addce760f4886166efa283302a53783581625 with SHA-1 d03ec51f38
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11764809
Change-Id: I6d7b17d0cbfdc1a789f0a20bd317f72b958d0a1e
2020-06-08 21:36:06 +00:00
Steve Muckle
08ced9334d
[automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38
am: 239258fbf5
-s ours am: ef6ff11466
-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: I401d5ff4c69a35241cb66a5407bdb4236bf83ac5
2020-06-08 21:35:58 +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
Steve Muckle
b46eb198d2
[automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38
-s ours am: d1f15422d2
-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: I238b3dadb1f804dc10535ed4fdca2ac0ca934c29
2020-06-08 21:23:38 +00:00
Steve Muckle
2a25ba9939
fix spurious / on toplevel kernel module installations am: d03ec51f38
am: 239258fbf5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11764809
Change-Id: Ic33bb376d975517e1f046444243350769a4962dc
2020-06-08 21:23:29 +00:00
Steve Muckle
ef6ff11466
[automerger skipped] fix spurious / on toplevel kernel module installations am: d03ec51f38
am: 239258fbf5
-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: I469b49e141c081bca753c25149ff4998e057cb3c
2020-06-08 21:23: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