Commit Graph

89516 Commits

Author SHA1 Message Date
Treehugger Robot
6bd2bd8ae5 Merge "Remove the X attribute from .mk files" into main 2023-07-11 22:15:06 +00:00
Roman Kiryanov
f945b5df68 (reland2) Remove emulator dependencies on non emulator targets (2)
the sidecar issue in GSI was fixed.

Bug: 111538404
Test: presubmit
Change-Id: Ia48ce2e076edc4f13f85e58d9bbbe15b8e6a4438
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-07-11 14:16:35 -07:00
Roman Kiryanov
3a3b121154 Remove the X attribute from .mk files
Bug: 111538404
Test: presubmit
Change-Id: Iefd39e76559ec25c4bdd98893dfc593816da5077
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-07-11 14:16:35 -07:00
Kelvin Zhang
64f1b4f339 Merge "Mark extracted files as executable" into main am: f3f6d0569b
Original change: https://android-review.googlesource.com/c/platform/build/+/2650068

Change-Id: Iefc9c727afa46a8670cbe865d52597695bb0c344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 18:16:24 +00:00
Kelvin Zhang
f3f6d0569b Merge "Mark extracted files as executable" into main 2023-07-11 17:39:31 +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
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
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
db2c2d2377 Merge "aconfig: cpp codegen update: Move server_configurable_flags header include" into main 2023-07-11 08:42:13 +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
Android Build Coastguard Worker
1776e1e3dc Version bump to UP1A.230623.011 [core/build_id.mk]
Change-Id: Ic6569c708da11c29a6819ab6bfc65a2fd82c2b9d
2023-07-11 00:41:13 +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
Android Build Coastguard Worker
eb24af85f9 Version bump to UP1A.230623.010 [core/build_id.mk]
Change-Id: Ib17e00d43f933204bcad1403fb4e8bb2ea5ff610
2023-07-09 10:04:30 +00:00
Joe Onorato
63a84551ca Combine aconfig cache files into per-partition dumps.
Bug: 283910439
Test: manual validation of outputs, soong unit tests
Change-Id: I5f7dc16ee42c3722dc66ffe964ed20479eea1e15
2023-07-07 17:33:09 -07:00
David Fu
05d16bc191 Added haiku-presubmit phony rule to makefile
Change-Id: I85ef4dfcbe399a413e7ebccd4c5fbabdaf78401d
2023-07-07 19:22:42 +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
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
Santiago Aboy Solanes
9ebfc23191 Merge "Remove dmtracedump from build/make" into main 2023-07-07 15:30:21 +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
Android Build Coastguard Worker
5de2c023e7 Version bump to UP1A.230623.009 [core/build_id.mk]
Change-Id: I8b31360a649791d5ef5393bc36a23b9f3eb5b7dd
2023-07-07 01:23:48 +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
Jooyung Han
7650ddad01 Install vintf_fragments even when they are shared
Vintf_fragments should be installed regardless when they are shared with
other modules or not.

cc_binary {
  name: "foo",
  vintf_fragments: ["shared.xml"],
}

cc_binary {
  name: "bar",
  vintf_fragments: ["shared.xml"],
}

Either `m bar` or `m foo` should install `shared.xml`.

Previously, only *new* vintf_fragments were installed, which means, one
of "foo" or "bar" didn't trigger the installation of "shared.xml".

Bug: 198818343
Test: (see above)
Change-Id: I52b831df046b585db41449f06a6f9c684d623468
2023-07-06 13:45:12 +09:00
Chuong Hoang
4746c76dde Merge "Add brightness-related TARGET_RECOVERY_UI_ properties" am: 82d233a1bd
Original change: https://android-review.googlesource.com/c/platform/build/+/2646379

Change-Id: Ie9c80988cd19f52c9e43c91dad589a722ca49961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:52:43 +00:00
Wenshan Fu
c522f116cb Merge "aconfig: create java libraries for aconfig proto" am: a2d93ae1eb
Original change: https://android-review.googlesource.com/c/platform/build/+/2648125

Change-Id: I2f5be25060d812eb086d1c66bdfe59f2eea34022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:51:28 +00:00
Chuong Hoang
82d233a1bd Merge "Add brightness-related TARGET_RECOVERY_UI_ properties" 2023-07-06 02:23:16 +00:00
Wenshan Fu
a2d93ae1eb Merge "aconfig: create java libraries for aconfig proto" 2023-07-06 01:51:08 +00:00
Treehugger Robot
6cf2633dc5 Merge "Add test for b failing" am: 50619b69b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2646275

Change-Id: Ifc5fa5240b5a2f8ee4cb29ecd0def04aca092ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:57:14 +00:00
Treehugger Robot
50619b69b8 Merge "Add test for b failing" 2023-07-05 23:55:58 +00:00
Android Build Coastguard Worker
bdd5df7213 Version bump to UP1A.230623.008 [core/build_id.mk]
Change-Id: I82b9846826c8744876c997c50e05cdf1d8ffafff
2023-07-05 23:28:33 +00:00
Treehugger Robot
55d230847e Merge "Quote pattern in 'find' command used to generate modules.load" am: 530db0e770
Original change: https://android-review.googlesource.com/c/platform/build/+/2648959

Change-Id: I4e9dc97067a41803c3c9a2b21917600f21b1b353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 21:29:30 +00:00
Treehugger Robot
530db0e770 Merge "Quote pattern in 'find' command used to generate modules.load" 2023-07-05 20:52:22 +00:00
Dennis Shen
6f1c3fe881 Merge "cpp codegen redesign, unit test support" am: 99d4a49d68
Original change: https://android-review.googlesource.com/c/platform/build/+/2642133

Change-Id: I1f6a4642d10a72f7f402e040353685771a03d815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 19:37:17 +00:00
Cole Faust
a497402de7 Add test for b failing
Because we've introduced bugs before where b doesn't exit with the
correct status code when bazel fails.

Bug: 289436072
Test: ./build/make/tests/b_tests.sh
Change-Id: Ia9cb990c627f7b68636e6277a7c637d62312826d
2023-07-05 12:26:55 -07:00
Daniel Zheng
f9c4bd3f3e Moving vendor_boot out of BOARD_AVB_ENABLE block
vendor_boot is unrelated to this conditional. Moving it out so that this
instruction will be added on devices which don't have this set

Test: lunch db845c-userdebug, m fastboot_info
Change-Id: I34ad24d4f32d727f0f82749ed13c3de08566e880
2023-07-05 12:20:57 -07:00
Dennis Shen
99d4a49d68 Merge "cpp codegen redesign, unit test support" 2023-07-05 19:03:11 +00:00
Sorin Basca
f32074304e Merge "Add test utils script to xTS zips" am: e029e1e7ba
Original change: https://android-review.googlesource.com/c/platform/build/+/2361760

Change-Id: I232d8db33805395d1105d986e8a2d278e320b23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 18:05:45 +00:00
Sorin Basca
e029e1e7ba Merge "Add test utils script to xTS zips" 2023-07-05 17:23:30 +00:00
Dennis Shen
8d544f7439 cpp codegen redesign, unit test support
cpp codegen iteration 2, based on discussions with three internal teams
that use c++. Refer to the design doc "aconfig c++ codegen" for detailed
design. At a high level, we generate two sets of code artifacts with the
same signatured api: one for production that without any local flag
override capability, one for unit test that allows local flag overrides.
It supports static methods style interface as well as injection pattern.

Refer to the test points in the codegen_cpp.rs for examples of generated
code.

for production target codegen: aconfig create-cpp-lib --cache <cache> --out <out dir>
for test target codegen: aconfig create-cpp-lib --cache <cache> --out
<out dir> --mode test

Bug: b/279483801
Test: atest aconfig.test
Change-Id: I92fefb9623d5435525339a74f57bbd36d0afef08
2023-07-05 14:05:44 +00:00
Wenshan Fu
89467c3109 aconfig: create java libraries for aconfig proto
Host side test infra needs the library to consume the dumped flags info
generated by aconfig.

Test: m libaconfig_java_proto_lite libaconfig_java_proto_full
Bug: 289906970
Change-Id: I9891cb8445b90f7269e0c679ceaae6bc102bbb0c
2023-07-05 13:57:19 +00:00
Rashid Zaman
c4624460ca Quote pattern in 'find' command used to generate modules.load
When a kernel module archive is specified via
BOARD_*_KERNEL_MODULES_ARCHIVE an unquoted wildcard pattern in the
'find' command used to find modules to add to modules.load can result
in a build failure due to shell expansion. Fix this by quoting the
pattern so that kernel modules in $ANDROID_BUILD_TOP don't cause
unexpected build failures.

Bug: 289887845
Test: Define BOARD_VENDOR_KERNEL_MODULES_ARCHIVE for
aosp_cf_x86_64_phone, touch foo.ko &&
lunch aosp_cf_x86_64_phone-userdebug && m succeeds.

Change-Id: I8122afc6bbbb5df6e3b11922b2be38129addeda0
Signed-off-by: Rashid Zaman <rashidz@meta.com>
2023-07-04 23:16:34 -07:00