Kelvin Zhang
f3f6d0569b
Merge "Mark extracted files as executable" into main
2023-07-11 17:39:31 +00:00
Colin Cross
107d88e6ab
Merge "Dist kernel_version.txt" into main am: b177e347aa
am: 7ea1cb5152
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652360
Change-Id: Ia257da8668cb11715de39c4b73ed1349b131f278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 17:31:53 +00:00
Elliott Hughes
d9cdcba928
Merge "Switch from minigzip to gzip." into main am: c1577ff58b
am: f94ff9146d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009
Change-Id: Ieb4de103e7be0dd217c22d5ff7a44ee4041c834c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 17:31:17 +00:00
Austin Borger
1e452882b5
[automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64
-s ours
...
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718
Change-Id: I0f91b2093f7aa32e5f82a57e9711f29afef354c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 17:12:19 +00:00
Spandan Das
2fc41d1ca5
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008
-s ours
...
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718
Change-Id: I7af46700e0bfef1e7e689062d38d18b8ac364541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 17:11:16 +00:00
Colin Cross
7ea1cb5152
Merge "Dist kernel_version.txt" into main am: b177e347aa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652360
Change-Id: I8d952d05b10390796d73b69681d99e5e4d85be8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 16:42:58 +00:00
Elliott Hughes
f94ff9146d
Merge "Switch from minigzip to gzip." into main am: c1577ff58b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009
Change-Id: Ib6eeccad98122d2ad26a89fe44897ecabc610e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 16:42:34 +00:00
Austin Borger
8a0ae28e64
Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev
2023-07-11 16:27:24 +00:00
Colin Cross
b177e347aa
Merge "Dist kernel_version.txt" into main
2023-07-11 16:25:13 +00:00
Elliott Hughes
c1577ff58b
Merge "Switch from minigzip to gzip." into main
2023-07-11 15:52:27 +00:00
Jooyung Han
2ecded04a6
Do not install required modules from order-only deps
...
When a vintf_fragments or init_rc file is shared by two modules,
unintended modules are installed due to the shared file.
This was caused by add-all-target-to-target-required-modules-deps.
With the following definitions:
cc_binary {
name: "foo",
vintf_fragments: ["shared.xml"],
required: ["foo-req"],
}
cc_binary {
name: "bar",
vintf_fragments: ["shared.xml"],
}
When installing "bar", surprisingly, "foo-req" is installed due to the
link between "shared.xml" and "foo-req" added by
add-all-target-to-target-required-modules-deps.
To fix that, in this change, vintf_fragments and init_rc files are
marked as "order-only" deps. In
add-all-target-to-target-required-modules-deps, order-only deps are not
used to add links to "required" modules.
Now, with the same definitions, installing "bar" won't installs
"foo-req".
Bug: 198818343
Test: (see above)
Change-Id: I16be0dcb84564c559cb2f4223e2812321ee14729
2023-07-11 22:26:15 +09:00
Jooyung Han
b14b4cd6a5
Install vintf_fragments/init_rc along with targets
...
Even though `m foo` installs vintf_fragments and init_rc files. There
was no direct dependency from the installed target to
vintf_fragments/init_rc files.
With the following:
cc_binary {
name: "foo",
vintf_fragments: ["foo.xml"]
}
`m out/target/product/vsoc_x86_64/system/bin/foo` didn't install
foo.xml.
This change adds the order-only deps from the target install to
vintf_fragments/init_fc files.
Bug: 198818343
Test: (see above)
Change-Id: I4656d43d15407a85fea7c95b22e4bbe19fb86aee
2023-07-11 22:26:12 +09:00
Treehugger Robot
733681d6eb
Merge "aconfig: cpp codegen update: Move server_configurable_flags header include" into main am: db2c2d2377
am: a89218087e
am: 3eccd72fa3
am: 32c45b78da
am: 9b8ba1eca9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652484
Change-Id: Ibb76f5ae06329c3269795ca907c9ab6d61084f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 12:01:17 +00:00
Treehugger Robot
9b8ba1eca9
Merge "aconfig: cpp codegen update: Move server_configurable_flags header include" into main am: db2c2d2377
am: a89218087e
am: 3eccd72fa3
am: 32c45b78da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652484
Change-Id: Ic0669ca599d0158deb4734bc8f1e450995c99156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 11:20:44 +00:00
Treehugger Robot
32c45b78da
Merge "aconfig: cpp codegen update: Move server_configurable_flags header include" into main am: db2c2d2377
am: a89218087e
am: 3eccd72fa3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652484
Change-Id: Ief5bc225f7fcb1be7f921a7e327fc30dc4530c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 10:38:49 +00:00
Treehugger Robot
3eccd72fa3
Merge "aconfig: cpp codegen update: Move server_configurable_flags header include" into main am: db2c2d2377
am: a89218087e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652484
Change-Id: Ie68e4640594860ba3a9d02a6d4772b5f12df6b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 09:59:01 +00:00
Treehugger Robot
a89218087e
Merge "aconfig: cpp codegen update: Move server_configurable_flags header include" into main am: db2c2d2377
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652484
Change-Id: Ib20b5a4a142c650e3c39f51d688e72d8294aaff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 09:16:53 +00:00
Treehugger Robot
1a85723fac
Merge "core: Add script to check for possible shared library duplication" into main am: ebd2d0043b
am: 4204e8b135
am: 7fab985e23
am: 1610101e46
am: 9a26a247b1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2467321
Change-Id: Ibe576aa30c7117745d497bb1c968ca94651db65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 09:12:42 +00:00
Treehugger Robot
db2c2d2377
Merge "aconfig: cpp codegen update: Move server_configurable_flags header include" into main
2023-07-11 08:42:13 +00:00
Treehugger Robot
9a26a247b1
Merge "core: Add script to check for possible shared library duplication" into main am: ebd2d0043b
am: 4204e8b135
am: 7fab985e23
am: 1610101e46
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2467321
Change-Id: I8378d10a6d503ae5ed934a0ba1487e9d2277da9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 08:34:57 +00:00
Treehugger Robot
1610101e46
Merge "core: Add script to check for possible shared library duplication" into main am: ebd2d0043b
am: 4204e8b135
am: 7fab985e23
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2467321
Change-Id: I0595e0958dc47578ae35908fec1a1e01820f19f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 07:53:40 +00:00
Treehugger Robot
7fab985e23
Merge "core: Add script to check for possible shared library duplication" into main am: ebd2d0043b
am: 4204e8b135
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2467321
Change-Id: I78a59ed1f56b47caafa4ed07370d96903e20ee20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 06:48:37 +00:00
Treehugger Robot
4204e8b135
Merge "core: Add script to check for possible shared library duplication" into main am: ebd2d0043b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2467321
Change-Id: I8da1a3d5a964652e7ea2fe02b2151bfe850a494c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 06:06:53 +00:00
Treehugger Robot
ebd2d0043b
Merge "core: Add script to check for possible shared library duplication" into main
2023-07-11 05:12:08 +00:00
Kelvin Zhang
4cb28f6f80
Mark extracted files as executable
...
Python's zipfile doens't restore file permission by default, so we need
to manually restore permission.
Test: th
Bug: 290643514
Change-Id: I89c1e2ee178b534fa7e3f02afd04d170100d37e7
2023-07-10 13:03:07 -07:00
Dennis Shen
e398144643
aconfig: cpp codegen update: Move server_configurable_flags header include
...
Move server_configurable_flags header include away from exported header,
instead put it in the flag provider headers. Otherwise, it can cause
compilation error if the source code who wants to use the generated c flag lib has
not added dependency on server_configurable_flags yet.
Bug: b/279483801
Test: atest aconfig.test
Change-Id: Ib75877ee88f995caf72b3fd2554c3da195032c14
2023-07-10 18:19:44 +00:00
Shaju Mathew
2143900a7c
Updating build/config setup to refresh adb path name after a rebuild.
...
Bug: 24473359
Test: Treehugger
Change-Id: I706e24a8ba7b75a381e9efe48d5db2d49c0f4da6
2023-07-10 00:53:22 +00:00
Santiago Aboy Solanes
bc7064379c
Merge "Remove dmtracedump from build/make" into main am: 9ebfc23191
am: 1e6e7a03ab
am: c33b1893a8
am: 320bb73f13
am: 1bfbe71c73
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2640290
Change-Id: I765aedb4cf95dd7daca72c50d19f009d4718ac84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 18:59:38 +00:00
Colin Cross
27f36d1bc8
Dist kernel_version.txt
...
Fixes: 290361803
Test: treehugger
Change-Id: I146817c9cf256f086404c880a0215cb8e688c544
2023-07-07 18:25:09 +00:00
Santiago Aboy Solanes
1bfbe71c73
Merge "Remove dmtracedump from build/make" into main am: 9ebfc23191
am: 1e6e7a03ab
am: c33b1893a8
am: 320bb73f13
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2640290
Change-Id: I7b6221b0b6d6d4300346c18842fa1bee653634b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 18:17:58 +00:00
Santiago Aboy Solanes
320bb73f13
Merge "Remove dmtracedump from build/make" into main am: 9ebfc23191
am: 1e6e7a03ab
am: c33b1893a8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2640290
Change-Id: I8c8a4079974ee9e1009483350ab24f790471da9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 17:35:14 +00:00
Santiago Aboy Solanes
c33b1893a8
Merge "Remove dmtracedump from build/make" into main am: 9ebfc23191
am: 1e6e7a03ab
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2640290
Change-Id: I1e276e220afe3c0c174a9822b0dce2a923be7b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 16:53:43 +00:00
Treehugger Robot
ca818267be
Merge "aconfig: improve duplicate flags error message: include paths" into main am: 4fb5cb01f1
am: a41c49f15f
am: 7753deff07
am: c1b660cb76
am: a61fd11f8a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650121
Change-Id: I5eb6e8572d360ca34f0afc93ecabe822597fe799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 16:52:03 +00:00
Santiago Aboy Solanes
1e6e7a03ab
Merge "Remove dmtracedump from build/make" into main am: 9ebfc23191
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2640290
Change-Id: Ib0eee7237c81e43fe55da0c8569752e956891730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 16:11:42 +00:00
Treehugger Robot
a61fd11f8a
Merge "aconfig: improve duplicate flags error message: include paths" into main am: 4fb5cb01f1
am: a41c49f15f
am: 7753deff07
am: c1b660cb76
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650121
Change-Id: I16da505070c7387eaf2ae14eb3f6350f7eedd588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 16:11:05 +00:00
Santiago Aboy Solanes
9ebfc23191
Merge "Remove dmtracedump from build/make" into main
2023-07-07 15:30:21 +00:00
Treehugger Robot
c1b660cb76
Merge "aconfig: improve duplicate flags error message: include paths" into main am: 4fb5cb01f1
am: a41c49f15f
am: 7753deff07
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650121
Change-Id: I0ead33b5508e075fcc35b55b24ec61b875063344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 15:26:41 +00:00
Treehugger Robot
7753deff07
Merge "aconfig: improve duplicate flags error message: include paths" into main am: 4fb5cb01f1
am: a41c49f15f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650121
Change-Id: I3284d97b8c508f9d5a4d5a5706325d73dd8d3674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 14:43:50 +00:00
Treehugger Robot
a41c49f15f
Merge "aconfig: improve duplicate flags error message: include paths" into main am: 4fb5cb01f1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650121
Change-Id: Ibb6aa0dcdad684d11836c316156587163a70da07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 14:00:22 +00:00
Treehugger Robot
4fb5cb01f1
Merge "aconfig: improve duplicate flags error message: include paths" into main
2023-07-07 13:21:35 +00:00
Mårten Kongstad
206a382d4e
aconfig: improve duplicate flags error message: include paths
...
Improve the error message returned when `aconfig dump` is fed multiple
declarations of the same flag: include the paths to the declaration
files.
In general all error messages from the protos::*::verify_* functions
should include paths to the offending files. This will be handled in a
follow-up CL.
Bug: 290300657
Test: atest aconfig.test
Test: manual: add duplicate flag and run `m all_aconfig_declarations`, inspect error message
Change-Id: I46dc23f7128dd5c68ced9f2e8518cfa89d81c2df
2023-07-07 08:52:52 +02:00
Yabin Cui
12f52d7255
Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322d6
am: e9c4b39402
am: 41b77aa072
am: 8c766aeb63
am: abd2aae664
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2624306
Change-Id: Id3f9e32d0bff296faae978d1266a56e0e01319fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 03:36:20 +00:00
Yabin Cui
abd2aae664
Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322d6
am: e9c4b39402
am: 41b77aa072
am: 8c766aeb63
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2624306
Change-Id: Ieff6480db7e2e9e0de3b39e88bfd7a895333ea15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 02:50:39 +00:00
Yabin Cui
8c766aeb63
Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322d6
am: e9c4b39402
am: 41b77aa072
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2624306
Change-Id: I5f2b4a8329e94830cadcc89fb97c0c0f7d6c5784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 02:07:28 +00:00
Yabin Cui
41b77aa072
Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322d6
am: e9c4b39402
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2624306
Change-Id: Ie4ead40424947b204eb3d0b0091d124f19e3de9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 01:23:31 +00:00
Yabin Cui
e9c4b39402
Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2624306
Change-Id: I010d21a67e6103c8a1bd16da0ee5a19c86131c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:39:33 +00:00
Yabin Cui
9ec80322d6
Merge "Replace libc++.so.1 with libc++.so" into main
2023-07-06 23:54:42 +00:00
Chuong Hoang
f7b124ddfb
Merge "Add brightness-related TARGET_RECOVERY_UI_
properties" am: 82d233a1bd
am: 4746c76dde
am: ec4e722eb0
am: fec11e5f10
am: d596219792
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646379
Change-Id: I05395ee8751169cb953cf2e31834517c264891c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 06:09:11 +00:00
Wenshan Fu
f744dbfbed
Merge "aconfig: create java libraries for aconfig proto" am: a2d93ae1eb
am: c522f116cb
am: 80fd7410de
am: 8def391348
am: 91b6b53421
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2648125
Change-Id: If14e924c745f475e7daf45466df342293cdbbc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 06:08:58 +00:00
Chuong Hoang
d596219792
Merge "Add brightness-related TARGET_RECOVERY_UI_
properties" am: 82d233a1bd
am: 4746c76dde
am: ec4e722eb0
am: fec11e5f10
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646379
Change-Id: I638ab86f4c8326ccc37b0cf6c6564f55615227d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 05:27:33 +00:00