Commit Graph

77178 Commits

Author SHA1 Message Date
Eric Jeong
4c0ac42c06 Remove iorapd from base product packages
- iorapd is being removed.
- So, it cannot be installed.

Bug: 211461392
Test: build okay
Change-Id: I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9
2022-02-14 23:38:54 -08:00
Xin Li
a4293f3da1 [automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 4455b0dc97 -s ours am: 777a7208b3 -s ours
am skip reason: Merged-In Ibcb32225098883b4098807da6468a539e1c41c0c with SHA-1 aa5fc6ecbd is already in history

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

Change-Id: I2be5f2bce9b00f61ce04c26be330e5bb9a366f4f
2022-02-14 18:21:15 +00:00
Devin Moore
0edf9bf06c Merge "Get build.prop for init_boot.img from the ramdisk props" am: c3ee009f38 am: 192130b75e am: 605baddf83
Original change: https://android-review.googlesource.com/c/platform/build/+/1983226

Change-Id: I56b81e196e1f749e7b2a2c41d00c993cd4d8dcc2
2022-02-14 18:12:40 +00:00
Xin Li
777a7208b3 [automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 4455b0dc97 -s ours
am skip reason: Merged-In Ibcb32225098883b4098807da6468a539e1c41c0c with SHA-1 aa5fc6ecbd is already in history

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

Change-Id: Ifa5e647f9ef19332d4cf000752b34d19def87e6f
2022-02-14 18:03:51 +00:00
Devin Moore
605baddf83 Merge "Get build.prop for init_boot.img from the ramdisk props" am: c3ee009f38 am: 192130b75e
Original change: https://android-review.googlesource.com/c/platform/build/+/1983226

Change-Id: I6702eb56ac189329570981b93b10e205960c6e97
2022-02-14 17:54:23 +00:00
Xin Li
4455b0dc97 Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:31:18 +00:00
Devin Moore
192130b75e Merge "Get build.prop for init_boot.img from the ramdisk props" am: c3ee009f38
Original change: https://android-review.googlesource.com/c/platform/build/+/1983226

Change-Id: I7bdd2c301d1d5830acf5ff4e345538c2211a7cee
2022-02-14 17:30:53 +00:00
Devin Moore
c3ee009f38 Merge "Get build.prop for init_boot.img from the ramdisk props" 2022-02-14 17:14:47 +00:00
Artur Satayev
e4814b895b Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e13a am: 206f023938 am: f20c233bad
Original change: https://android-review.googlesource.com/c/platform/build/+/1976678

Change-Id: I2360bda8d8cc85e759f7870dea0ef09753551f5d
2022-02-14 12:59:22 +00:00
Artur Satayev
f20c233bad Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e13a am: 206f023938
Original change: https://android-review.googlesource.com/c/platform/build/+/1976678

Change-Id: Ie7320298cd0c1fa511e2174e13fe4f34fe1e8ac5
2022-02-14 12:43:40 +00:00
Artur Satayev
206f023938 Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e13a
Original change: https://android-review.googlesource.com/c/platform/build/+/1976678

Change-Id: I8ef068c1c9df48a456af8f7fe0148438fbe2c043
2022-02-14 12:25:22 +00:00
Artur Satayev
ac87c5e13a Merge "Introduce ro.build.version.known_codenames sysprop." 2022-02-14 12:08:04 +00:00
Treehugger Robot
6889493286 Merge "Add macros for declaring copied file licenses." am: 6d361637e3 am: 3d0b257b0a am: 0171332b5a
Original change: https://android-review.googlesource.com/c/platform/build/+/1978047

Change-Id: I9bb7e22cef08f7211b7051c3bc793dcc169c46c9
2022-02-12 02:48:02 +00:00
Treehugger Robot
0171332b5a Merge "Add macros for declaring copied file licenses." am: 6d361637e3 am: 3d0b257b0a
Original change: https://android-review.googlesource.com/c/platform/build/+/1978047

Change-Id: I527b9f9d5cad79132802e580f58ea11e28155291
2022-02-12 02:30:37 +00:00
Treehugger Robot
3d0b257b0a Merge "Add macros for declaring copied file licenses." am: 6d361637e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1978047

Change-Id: I0896ebb23f8418c83795316a276a7872811120d0
2022-02-12 02:13:47 +00:00
Bassem Khalife
bc8d3620db Update Security String to 2022-04-05 am: 41a3269dd6 am: 6c815b28f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16742828

Change-Id: I173a0b5da680b11694c0b6148be02867919c0e15
2022-02-12 02:06:38 +00:00
Treehugger Robot
6d361637e3 Merge "Add macros for declaring copied file licenses." 2022-02-12 01:59:49 +00:00
Bassem Khalife
6c815b28f9 Update Security String to 2022-04-05 am: 41a3269dd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16742828

Change-Id: Ia3b5d968b608239a114ebb9ea844386c7f0eb98d
2022-02-12 01:55:19 +00:00
Treehugger Robot
2fcee10b71 Merge "Support multiple library names per target." am: 5796849ac8 am: ba48b68251 am: 85f18c766c
Original change: https://android-review.googlesource.com/c/platform/build/+/1978111

Change-Id: I1620a0352071e3a760b477ac689a610d3743a9ad
2022-02-11 23:07:02 +00:00
Treehugger Robot
85f18c766c Merge "Support multiple library names per target." am: 5796849ac8 am: ba48b68251
Original change: https://android-review.googlesource.com/c/platform/build/+/1978111

Change-Id: I23aacc92824f5b762245499c9fe92806f2d21552
2022-02-11 22:49:19 +00:00
Treehugger Robot
ba48b68251 Merge "Support multiple library names per target." am: 5796849ac8
Original change: https://android-review.googlesource.com/c/platform/build/+/1978111

Change-Id: I7f93795f7723e3ede49b8d6281fc1476d6e0489a
2022-02-11 22:31:10 +00:00
Treehugger Robot
5796849ac8 Merge "Support multiple library names per target." 2022-02-11 22:17:17 +00:00
Bob Badour
8cbb845e37 Add macros for declaring copied file licenses.
The PRODUCT_COPY_FILES is populated before definitions.mk mapping
source files to installed files that get copied unchanged.

Need to be able to declare license metadata for the copied files such
that similarly named files in different projects can have different
licenses.

Need a macro to convert target names to their corresponding license
metadata.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m nothing

Change-Id: Ic244b3525e72b6cd8c4c4305bf5ad430d6e24ccb
2022-02-11 14:10:06 -08:00
Devin Moore
b5195ff5fe Get build.prop for init_boot.img from the ramdisk props
boot.img and init_boot.img get their build properties from the platform
ramdisk properties.

Test: "m dist" then drop the OTA zip file into
android.github.io/analyseOTA to verify init_boot is present.
Bug: 211823573

Change-Id: I411e62bf0fc3cb49d4b12dadb52d9820fca041fa
2022-02-11 18:44:26 +00:00
Neha Pattan
cadc6ee8e7 Merge "[2/2] Add SupplementalApi to BCP." 2022-02-11 16:08:36 +00:00
satayev
2d94586cff Introduce ro.build.version.known_codenames sysprop.
It defines values for Build.VERSION.KNOWN_CODENAMES constant, and should
contain all codenames starting from Q, including current codename
for in development branches.

Bug: 211747008
Test: presubmit
Change-Id: If8995750e369ba39bfc7041580c21b2f96632a78
2022-02-11 13:20:49 +00:00
Xin Li
b3a96bd273 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: Ibcb32225098883b4098807da6468a539e1c41c0c
Change-Id: I408a03e95c0240420c5e5492988abdc4937a0a62
2022-02-11 07:01:21 +00:00
Treehugger Robot
ff2384d551 Merge "Export runtime dependencies in module-info" am: b52c28d026 am: 8829ee1440 am: 5fb866e401 am: a482a6030d
Original change: https://android-review.googlesource.com/c/platform/build/+/1964821

Change-Id: Id5b5e9350ed76d3ce5d9a4bc6fa773244913a816
2022-02-11 02:07:40 +00:00
Treehugger Robot
a482a6030d Merge "Export runtime dependencies in module-info" am: b52c28d026 am: 8829ee1440 am: 5fb866e401
Original change: https://android-review.googlesource.com/c/platform/build/+/1964821

Change-Id: I9ceb8bc86c07697218592a80e2042af39f2353c8
2022-02-11 01:47:25 +00:00
Treehugger Robot
5fb866e401 Merge "Export runtime dependencies in module-info" am: b52c28d026 am: 8829ee1440
Original change: https://android-review.googlesource.com/c/platform/build/+/1964821

Change-Id: I9c6e9676de29f784cdb029b5dd35416a6effc0e1
2022-02-11 01:18:26 +00:00
Treehugger Robot
8829ee1440 Merge "Export runtime dependencies in module-info" am: b52c28d026
Original change: https://android-review.googlesource.com/c/platform/build/+/1964821

Change-Id: I0d8d74d1c8945b257cf95f65ca16b3fd0c3decc9
2022-02-11 01:01:13 +00:00
Treehugger Robot
b52c28d026 Merge "Export runtime dependencies in module-info" 2022-02-11 00:56:26 +00:00
Neha Pattan
a262e1c7ea [2/2] Add SupplementalApi to BCP.
Test: build
Bug: 218568223
Change-Id: I9f97bdf8dae9f0271755411293243bbfa9986acc
2022-02-10 23:23:17 +00:00
Treehugger Robot
e543b42944 Merge "add dmesgd to base system" am: dda4576d52 am: 1ca13e787e am: 8897c33a1c am: 80e3d3e6c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1979646

Change-Id: I686e765cf93560909658acfe84f412773dbf4551
2022-02-10 22:06:39 +00:00
Treehugger Robot
80e3d3e6c7 Merge "add dmesgd to base system" am: dda4576d52 am: 1ca13e787e am: 8897c33a1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1979646

Change-Id: I1c48600c690936337586836136f17131f697a3b4
2022-02-10 21:48:24 +00:00
Treehugger Robot
8897c33a1c Merge "add dmesgd to base system" am: dda4576d52 am: 1ca13e787e
Original change: https://android-review.googlesource.com/c/platform/build/+/1979646

Change-Id: I7941d286285883e0afef360b42640b7c888267ba
2022-02-10 21:23:59 +00:00
Treehugger Robot
1ca13e787e Merge "add dmesgd to base system" am: dda4576d52
Original change: https://android-review.googlesource.com/c/platform/build/+/1979646

Change-Id: I470b693861a683e2d958b452700b02c36cf1b311
2022-02-10 21:04:30 +00:00
Treehugger Robot
dda4576d52 Merge "add dmesgd to base system" 2022-02-10 21:00:55 +00:00
Alexander Potapenko
0015b6953a add dmesgd to base system
Bug: 215095687
Test: run on a user device with injected KFENCE bugs
Change-Id: I7776d96400d46fa31bcd8f04728877402dce1162
2022-02-10 15:46:01 +01:00
Treehugger Robot
dc04f552d5 Merge "Fix signing failure when no entry to convert to store" am: ea586a8d71 am: 8e9b39e061 am: 9c03d6a61e am: b3c67ad42e
Original change: https://android-review.googlesource.com/c/platform/build/+/1978755

Change-Id: I5a28c53819b7b7f99851cddb3ff0f7363c6c11d4
2022-02-10 13:57:06 +00:00
Treehugger Robot
b3c67ad42e Merge "Fix signing failure when no entry to convert to store" am: ea586a8d71 am: 8e9b39e061 am: 9c03d6a61e
Original change: https://android-review.googlesource.com/c/platform/build/+/1978755

Change-Id: I400ba06e31f5126bb4c00cc5f592888280229423
2022-02-10 13:42:33 +00:00
Treehugger Robot
9c03d6a61e Merge "Fix signing failure when no entry to convert to store" am: ea586a8d71 am: 8e9b39e061
Original change: https://android-review.googlesource.com/c/platform/build/+/1978755

Change-Id: I60b98f588cb1a19d122bc866dc4a24d3d8f379cb
2022-02-10 13:28:24 +00:00
Treehugger Robot
8e9b39e061 Merge "Fix signing failure when no entry to convert to store" am: ea586a8d71
Original change: https://android-review.googlesource.com/c/platform/build/+/1978755

Change-Id: I1d311e6a5c0e4bf782d20ed4d00c2b138ac9bd49
2022-02-10 13:10:17 +00:00
Treehugger Robot
ea586a8d71 Merge "Fix signing failure when no entry to convert to store" 2022-02-10 12:53:00 +00:00
Bob Badour
0a6ab27703 Merge "Greater-than zero is more idiomatic." am: 1848cef686 am: 7fda7d3641 am: 5f2ff8e600 am: 81ae2e8036
Original change: https://android-review.googlesource.com/c/platform/build/+/1978299

Change-Id: I021be628fb50fd11ed6f0775036c44949e9d3b5d
2022-02-10 11:03:51 +00:00
Bob Badour
81ae2e8036 Merge "Greater-than zero is more idiomatic." am: 1848cef686 am: 7fda7d3641 am: 5f2ff8e600
Original change: https://android-review.googlesource.com/c/platform/build/+/1978299

Change-Id: I43471a8503e3169e6ee990e2e0bef582678987e8
2022-02-10 10:48:53 +00:00
Bob Badour
5f2ff8e600 Merge "Greater-than zero is more idiomatic." am: 1848cef686 am: 7fda7d3641
Original change: https://android-review.googlesource.com/c/platform/build/+/1978299

Change-Id: I9d9be74a2789a3b3c0cd489694c5a0d47b33d7cc
2022-02-10 10:33:35 +00:00
Treehugger Robot
1ce4fa639e Merge "Add an misc_info.txt entry to customize VABC compression" am: 3c84e5f114 am: a1e8783ffd am: f76bbe1ddb am: 0d48483d39
Original change: https://android-review.googlesource.com/c/platform/build/+/1978746

Change-Id: I2b16400c876c49bfc3e6e3656c5bba2987c3a41b
2022-02-10 10:32:45 +00:00
Bob Badour
7fda7d3641 Merge "Greater-than zero is more idiomatic." am: 1848cef686
Original change: https://android-review.googlesource.com/c/platform/build/+/1978299

Change-Id: I06406aa42a72c5278bbbeb636c1b3d958005ac23
2022-02-10 10:07:58 +00:00
Treehugger Robot
0d48483d39 Merge "Add an misc_info.txt entry to customize VABC compression" am: 3c84e5f114 am: a1e8783ffd am: f76bbe1ddb
Original change: https://android-review.googlesource.com/c/platform/build/+/1978746

Change-Id: I41eb3c619adf01b15782af5afb14d4abacf4cf62
2022-02-10 10:06:08 +00:00