Commit graph

85043 commits

Author SHA1 Message Date
Amith Dsouza
cab8fc9658 Update BUILD_ID
Master branch has been renamed to main, the build id needs to reflect
this change.

Ignore-AOSP-First: Merge conflict resolutions
Bug: 290400015
Change-Id: I77884da7587fecae362f9c82fee9f45ff9878cc0
Merged-In: Ieb8b84d340f2308255ad2f23e5ac23635fb680de
Merged-In: Ife1860b73bc83d32a61817d5a9fe25c2deb1e37d
Merged-In: I132433a625848a210603a2e0ad102c12435b3ba4
Merged-In: I740ef3225c4c291ef7313d3ff1fe5d78389497f5
2023-07-12 23:12:35 +00:00
Santiago Aboy Solanes
9ebfc23191 Merge "Remove dmtracedump from build/make" into main 2023-07-07 15:30:21 +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
9ec80322d6 Merge "Replace libc++.so.1 with libc++.so" into main 2023-07-06 23:54:42 +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
50619b69b8 Merge "Add test for b failing" 2023-07-05 23:55:58 +00:00
Treehugger Robot
530db0e770 Merge "Quote pattern in 'find' command used to generate modules.load" 2023-07-05 20:52:22 +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
Dennis Shen
99d4a49d68 Merge "cpp codegen redesign, unit test support" 2023-07-05 19:03:11 +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
Kangping Dong
235662f15a Merge "add com.android.threadnetwork to base_system.mk" 2023-07-04 01:52:46 +00:00
Wenshan Fu
e0b709b9a6 Merge "Create the TEST_MAPPING file" 2023-07-04 00:44:05 +00:00
Treehugger Robot
f81a3793f4 Merge "Adds Window Extensions to GSI" 2023-07-03 11:00:58 +00:00
Kangping Dong
286e55ad94 add com.android.threadnetwork to base_system.mk
Bug: 262683651
Test: atest CtsSystemApiSignatureTestCases
Merged-In: Iefe7fa4c74ab9608faeb9d64e75c054e9b90afdb
Change-Id: Id4f34b70aee2277236762092f8a40254963a6b4f
2023-07-03 17:24:05 +08:00
Louis Chang
886ad7a862 Adds Window Extensions to GSI
... in order to have window extension library included
especially on large screen devices.

Bug: 288624195
Test: atest SdkAvailabilityTest
Ignore-AOSP-First: Future release
Change-Id: I8d347917f002cefb4f297930370ac7ae847f4731
2023-07-03 13:29:20 +08:00
Treehugger Robot
03bc41cae7 Merge "Enable CFI for the whole Bluetooth repo and not just system" 2023-06-30 22:04:30 +00:00
Ulya Trofimovich
40b9ac7ee5 Merge "Add riscv64 banchan target." 2023-06-30 14:05:16 +00:00
Zhi Dou
7734879e69 Merge changes I4bf1d3ba,I33605054
* changes:
  aconfig: Add resetAll method to test mode FeatureFlagsImpl
  aconfig: remove extra new lines and spaces in generated java code
2023-06-30 13:23:28 +00:00
Treehugger Robot
32efc846f5 Merge "Add --classes optional flag in list_files" 2023-06-30 09:36:42 +00:00
Wei Li
f711149a5c Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" 2023-06-30 07:53:45 +00:00
Chuong Hoang
b684a13c1c Add brightness-related TARGET_RECOVERY_UI_ properties
Bug: 221048336
Test: combined with the other CL in same topic, observed recovery
brightness updated correctly according to variables set in BoardConfig.

Change-Id: Iebad0753079414a5e11bce04008ee405c8d03580
2023-06-30 04:44:23 +00:00
Wenshan Fu
13be0a5f98 Create the TEST_MAPPING file
Add FlagAnnotationTests in presubmit to ensure that test filtering rule
always works as expected.

Test: atest --test-mapping
Bug: 277819423
Change-Id: I7cc3a70495f8d62ed7a5b26edc4fd240e73ccf61
2023-06-30 03:28:02 +00:00
Wei Li
50745668c3 Revert "Revert "Support SBOM generation of m build unbundled APEXs.""
This reverts commit bab162156e.

Reason for revert: issue is fixed in ag/23851209.

Change-Id: I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9
2023-06-30 02:33:36 +00:00
David Duarte
d759b3517a Enable CFI for the whole Bluetooth repo and not just system
Bug: 282222542
Change-Id: Idd0e0c4ab01e703190038c103b41730d68f01be0
2023-06-29 21:01:48 +00:00
Jiakai Zhang
f164097056 Merge "Use per-app package list to avoid unnecessary dexpreopt." 2023-06-29 17:33:43 +00:00
Zhi Dou
8d27cc39b1 aconfig: Add resetAll method to test mode FeatureFlagsImpl
Add resetAll method to test mode FeatureFlagsImpl. This method
is used to reset all the flags values to null. It provides convenient
way to the test tools to reset the flags values.

Bug: 280833463
Test: atest aconfig.test
Change-Id: I4bf1d3ba69ee106ef8d0c1cc62c00bbeca1b72aa
2023-06-29 15:15:32 +00:00
Zhi Dou
a41cc5ecf9 aconfig: remove extra new lines and spaces in generated java code
Change the java template to remove the extra new lines and spaces
in generated java code.

Bug: 280833463
Test: atest aconfig.test
Change-Id: I336050540f8a2b0966bf21cf6e034a8fa701458e
2023-06-29 15:05:18 +00:00
Treehugger Robot
9c3da21b6e Merge changes from topic "aconfig-package-ident-fixes"
* changes:
  aconfig: package fields must contain at least one dot char
  aconfig: fix incorrect check in create_device_config_ident
  aconfig: improve package identifier test readability
2023-06-29 14:38:07 +00:00
Mårten Kongstad
19776d19e6 aconfig: package fields must contain at least one dot char
Introduce a new requirement on package fields: a package must contain at
least one dot character.

Bug: 289336036
Test: atest aconfig.test
Change-Id: Idadcd2a76783a484cc5c6d6e94778c0248fa475f
2023-06-29 10:38:02 +02:00
Mårten Kongstad
c0d618c3a4 aconfig: fix incorrect check in create_device_config_ident
Use is_valid_name_ident to check the flag name, not
is_valid_package_ident.

Bug: 283910447
Test: atest aconfig.test
Change-Id: I3718e7de565b975a1696190e8effbcb077e5fde2
2023-06-29 10:18:20 +02:00
Mårten Kongstad
60ee8a633f aconfig: improve package identifier test readability
Rearrange the tests in test_is_valid_package_ident to make it more
apparent what constitutes a valid package pattern, and what doesn't.

Bug: 283910447
Test: atest aconfig.test
Change-Id: I3d2b87aed008d0ed3a0aa6e483e655178dda7277
2023-06-29 10:03:38 +02:00
Jooyung Han
0f8339dcac Merge "Add apexd_host to otatools" 2023-06-29 06:01:38 +00:00
Treehugger Robot
6d2b198f87 Merge "add sha256 to art-host-tests zip to lower rbe upload overhead" 2023-06-29 05:50:23 +00:00
Jooyung Han
8f0dcc28a4 Add apexd_host to otatools
It's used by other tools like check_target_files_vintf and
merge_target_files.

Bug: 289274238
Test: m otatools-package # see if otatools.zip has apexd_host
Change-Id: Ie2e939b00846d5f0a5d81b26f39ac11ff08ff383
2023-06-29 12:43:10 +09:00
Julien Desprez
7b94cc7170 add sha256 to art-host-tests zip to lower rbe upload overhead
Avoid a cas unzip/upload by using the soong_zip option

Change-Id: I4ef8571a43ccf49d01e876605759e82f8e87dbc5
Test: presubmit
Bug: 286959075
2023-06-29 00:18:38 +00:00
Treehugger Robot
0dc5eeaaca Merge "Make test more deterministic by setting search_path to None" 2023-06-28 22:28:28 +00:00
Jooyung Han
c269ec3538 Merge changes from topic "apexd_host"
* changes:
  Use apexd_host for host-side APEX extraction
  Deprecate flattened apexes
2023-06-28 17:36:15 +00:00
Kelvin Zhang
03dc6ee96f Make test more deterministic by setting search_path to None
Test: th
Bug: 2640751
Change-Id: I9779dfa40c1e8319cb67ae0928c977f5a10cda5f
2023-06-28 10:10:39 -07:00
Jiakai Zhang
73ecc5b27a Use per-app package list to avoid unnecessary dexpreopt.
Similar to aosp/2637193, but for apps defined in Makefile.

Bug: 288218403
Test: m
Test: Change PRODUCT_PACKAGES and see no dexpreopt reruns.
Change-Id: If0ecbb2d210a780c56ea506bb8d3363e1bd91f58
2023-06-28 17:59:39 +01:00
Zhi Dou
514f99b205 Merge "aconfig: add java codegen test mode" 2023-06-28 13:01:01 +00:00
Ulya Trafimovich
08c381b8b2 Add riscv64 banchan target.
Test: banchan riscv64 com.android.art
Test: build/soong/build_test.bash --dist -products module_riscv64
Bug: 271573990
Change-Id: I6aa8c51b1a1928b3da52a9345a8bfb84e3eb11d0
2023-06-28 13:58:30 +01:00
Treehugger Robot
59f99b31eb Merge "Fix test flake" 2023-06-28 01:18:55 +00:00
Dan Albert
ef530fdf9a Merge changes from topic "module-rule-tracing"
* changes:
  Trace time spent in cp rules for dist targets.
  Trace build time by module name.
2023-06-27 21:19:46 +00:00
Zhi Dou
8ba6aa71b1 aconfig: add java codegen test mode
Add java codegen test mode. The test mode will generate Flags.java and
FeatureFlagsImpl.java differently.
    * Flags.java will have getter and setter function to switch the
      FeatureFlagsImpl. Flags.java will not initialize the instance
      of FeatureFlagsImpl during initialization, thus it will force the
      user to set up the flag values for the tests.
    * FeatureFlagsImpl removes the dependency on DeviceConfig, and
      allows the caller to set the values of flags.

Command changes
This change adds a new parameter `mode` to `create-java-lib` subcommand.
The default value of `mode` is production, which will generate files for
production usage, and keeps the same behavior as before.

The new `mode` test is added to trigger the test mode. The command is
aconfig create-java-lib --cache=<path_to_cache> --out=<out_path>
--mode=test

Test: atest aconfig.test
Bug: 288632682
Change-Id: I7566464eb762f3107142fe787f56b17f5be631b7
2023-06-27 18:57:35 +00:00
Sorin Basca
b5a59eaf22 Add test utils script to xTS zips
Test: m cts && unzip android-cts.zip && ./cts-trafed
Change-Id: Iee05bdb03e949eb2f70c9f754190242bc47e5f4e
2023-06-27 19:46:00 +01:00