Commit Graph

89050 Commits

Author SHA1 Message Date
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
7668d5ecf6 Merge "aconfig: add java codegen test mode" am: 514f99b205 am: a99ddd3b84 am: 5366554972 am: 9f6e482d0d am: 24c45908c1
Original change: https://android-review.googlesource.com/c/platform/build/+/2638410

Change-Id: I318e707ac50a6561f58655f2fb0f6784834825de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 16:49:55 +00:00
Zhi Dou
24c45908c1 Merge "aconfig: add java codegen test mode" am: 514f99b205 am: a99ddd3b84 am: 5366554972 am: 9f6e482d0d
Original change: https://android-review.googlesource.com/c/platform/build/+/2638410

Change-Id: I494d8582cbd07146490d1ce6b4799cbaf88a0c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 16:13:09 +00:00
Zhi Dou
9f6e482d0d Merge "aconfig: add java codegen test mode" am: 514f99b205 am: a99ddd3b84 am: 5366554972
Original change: https://android-review.googlesource.com/c/platform/build/+/2638410

Change-Id: Ie6a4e474af8ae2c0e03433df7218ffff2680dba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 15:30:08 +00:00
Zhi Dou
5366554972 Merge "aconfig: add java codegen test mode" am: 514f99b205 am: a99ddd3b84
Original change: https://android-review.googlesource.com/c/platform/build/+/2638410

Change-Id: I0d1096a7554f695b8a57f7c618c2c0e220a18dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 14:44:08 +00:00
Zhi Dou
a99ddd3b84 Merge "aconfig: add java codegen test mode" am: 514f99b205
Original change: https://android-review.googlesource.com/c/platform/build/+/2638410

Change-Id: I164c75e0c0ab5e8ebdff7c9a746d4d08e4d9d3ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 14:05:08 +00: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
779f196443 Merge "Fix test flake" am: 59f99b31eb am: b56b3b7b38 am: 01aeb2872c am: 886edb56eb am: 1d130fc5d7
Original change: https://android-review.googlesource.com/c/platform/build/+/2640751

Change-Id: I7e189efbc4aa2824c37f713c335151cdeea26504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 05:33:35 +00:00
Treehugger Robot
1d130fc5d7 Merge "Fix test flake" am: 59f99b31eb am: b56b3b7b38 am: 01aeb2872c am: 886edb56eb
Original change: https://android-review.googlesource.com/c/platform/build/+/2640751

Change-Id: If406d6910f753fb9f25f31d39caaddc9f0962ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 04:33:20 +00:00
Treehugger Robot
886edb56eb Merge "Fix test flake" am: 59f99b31eb am: b56b3b7b38 am: 01aeb2872c
Original change: https://android-review.googlesource.com/c/platform/build/+/2640751

Change-Id: Iade474f2717f72ee790965de8cfa4bd17d56347d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 03:44:24 +00:00
Treehugger Robot
01aeb2872c Merge "Fix test flake" am: 59f99b31eb am: b56b3b7b38
Original change: https://android-review.googlesource.com/c/platform/build/+/2640751

Change-Id: I26e28a9e8261ef149adf31bbf3f1b5b7221a9a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 02:58:03 +00:00
Treehugger Robot
b56b3b7b38 Merge "Fix test flake" am: 59f99b31eb
Original change: https://android-review.googlesource.com/c/platform/build/+/2640751

Change-Id: Ief9e2c178f614b92711efd55d1c72f53315844c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 02:18:07 +00:00
Dan Albert
ae2e7cf645 Merge changes from topic "module-rule-tracing" am: ef530fdf9a am: d3bcae7208 am: 9530bfba04 am: 65e23a90b3 am: 760ae18831
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860

Change-Id: Iab9aea34736316a4e7dfb921b80bbd0e2ffbba70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 01:31:37 +00:00
Treehugger Robot
59f99b31eb Merge "Fix test flake" 2023-06-28 01:18:55 +00:00
Dan Albert
760ae18831 Merge changes from topic "module-rule-tracing" am: ef530fdf9a am: d3bcae7208 am: 9530bfba04 am: 65e23a90b3
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860

Change-Id: I77b729384f42ec2fe61c94c1516b3b14a3c531cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 00:44:48 +00:00
Dan Albert
65e23a90b3 Merge changes from topic "module-rule-tracing" am: ef530fdf9a am: d3bcae7208 am: 9530bfba04
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860

Change-Id: I09fc357de938231dba15afe4eef3a8be5d1ab681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 23:37:11 +00:00
Dan Albert
9530bfba04 Merge changes from topic "module-rule-tracing" am: ef530fdf9a am: d3bcae7208
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860

Change-Id: Ie0f3c87a52d06210d7277a969ed48e3be7db9545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 22:53:59 +00:00
Elliott Hughes
97ad120adb Switch from minigzip to gzip.
Bug: http://b/288169261
Test: treehugger
Change-Id: I404cbcb850734ed8291c2215a4329fb372806d63
2023-06-27 15:39:05 -07:00
Dan Albert
d3bcae7208 Merge changes from topic "module-rule-tracing" am: ef530fdf9a
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860

Change-Id: I2668f18a1b4a61574afb3e8dc518bfb87c19c34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 22:11:39 +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
Daniel Zheng
d1826996d7 Merge "Adding recovery image" am: e86aa7b965 am: abecf30a5c am: 9ef45d62c5 am: 5d636ea855 am: 9b84a1c0a0
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171

Change-Id: Ic937c91883a6d78d2d07cbe4a9732350a24b6b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 19:58:58 +00:00
Devin Moore
2cb20dc050 Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807 am: c704aef70c am: bdf1d2ca5c am: 9a1f6292ce am: 4cf8e8f5fb
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512

Change-Id: I57906891f221480d41e44ddecb3d0ae5a77415c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 19:56:18 +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
Daniel Zheng
9b84a1c0a0 Merge "Adding recovery image" am: e86aa7b965 am: abecf30a5c am: 9ef45d62c5 am: 5d636ea855
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171

Change-Id: I7404b78aaab37bcea23632a52f09538fa354ed23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:50:05 +00:00
Devin Moore
4cf8e8f5fb Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807 am: c704aef70c am: bdf1d2ca5c am: 9a1f6292ce
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512

Change-Id: I799871e37d6b73266cbe825420435d664bbd03b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:49:05 +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
Daniel Zheng
5d636ea855 Merge "Adding recovery image" am: e86aa7b965 am: abecf30a5c am: 9ef45d62c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171

Change-Id: I428816bfc12162fc3008f062efb0323f6e5b8ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:05:05 +00:00
Devin Moore
9a1f6292ce Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807 am: c704aef70c am: bdf1d2ca5c
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512

Change-Id: Ic57aa84d0f5ca0d5fb470133d03c0b1b07a3e807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:04:06 +00:00
Kelvin Zhang
97a5afe0f3 Fix test flake
Test: th
Bug: 289013326
Change-Id: Ib233978ff861b010bdc3bd1a02ea9baefe6a3489
2023-06-27 10:30:48 -07:00
Daniel Zheng
9ef45d62c5 Merge "Adding recovery image" am: e86aa7b965 am: abecf30a5c
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171

Change-Id: I7970e845e7f062e970ab9e2c5f18b2ec3f93b6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 17:15:11 +00:00
Devin Moore
bdf1d2ca5c Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807 am: c704aef70c
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512

Change-Id: I95fd70c1c30bb6a84a60a21f01635b8a28f6afd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 17:14:24 +00:00
Daniel Zheng
abecf30a5c Merge "Adding recovery image" am: e86aa7b965
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171

Change-Id: I615f88d5e7bb0f477653229902dd40019f1a9f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 16:32:39 +00:00
Devin Moore
c704aef70c Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512

Change-Id: Idad3c5b0ed8c1451e3b83b8688624ac07cce3a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 16:31:27 +00:00
Daniel Zheng
e86aa7b965 Merge "Adding recovery image" 2023-06-27 16:07:27 +00:00
Devin Moore
8c9a990807 Merge "Pass system_ext and product dirs to libvintf" 2023-06-27 15:45:30 +00:00
Santiago Aboy Solanes
06adf82ca7 Remove dmtracedump from build/make
Bug: 287576918
Fixes: 287576918
Change-Id: Ie84cccf97ddf7e9277d28759000ad35ebf813d1a
2023-06-27 16:06:23 +01:00
Louis Chang
fb617dd880 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-06-27 09:47:35 +00:00
Jooyung Han
c9542abbbd Use apexd_host for host-side APEX extraction
Host-side simulation of APEX activation is done by a new tool
'apexd_host'. This simplies checkvintf invocation for local builds and
for target-files.

For local builds, checkvintf no londer depends on $OUT/apex, a flattened
view of APEXes. In fact, the build system doesn't need to install
$OUT/apex. They are installed for now only for its side-effect of
installing symbol files. We'd better not rely on $OUT/apex.

For target-files, scanning/activating apexes are extracted and moved to
the new tool. Now check_target_files_vintf is not more efficient because
it doesn't copy .apex files to a temporary directory.

Bug: 260358957
Bug: 288826922
Test: m (running checkvintf) # for local builds
Test: m target-files-package && check_garget_files_vintf target-files.zip
Test: atest releasetools_test
Change-Id: Iba23f429d96f9ec31814196aa14bdbb800649218
2023-06-27 17:00:06 +09:00
Xin Li
dfb913d479 [automerger skipped] Merge "Merge Android 13 QPR3" am: 24c928cda8 -s ours am: 8476205b04 -s ours am: 823af11644 -s ours am: 53b2cabdd2 -s ours am: ea6caff90b -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: I05b4fe0caa6f2bc6029881d7464ce4d1fb9fac57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 07:27:59 +00:00
Xin Li
747cbc2834 [automerger skipped] Merge Android 13 QPR3 am: 7f534ea9b9 -s ours am: 420d124c7f -s ours am: 5f70b9bf78 -s ours am: f586549b0b -s ours am: d67e7d6870 -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: Ifc1fdbfad8bdc1ca3c1dade199e3c4d6ffa4ef4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 07:25:59 +00:00
Jihoon Kang
c8e1d69687 Add --classes optional flag in list_files
The flag enables list_files to output a list of .class files pattern
that will be generated when compiling the java files in the input
directory. The flag can be used to extract the appropriate class files
from stub jar file provided via dep_api_srcs in per api scope
sdk_library generated java_api_library modules.

Test: m --build-from-text-stub in same topic
Bug: 275570206
Change-Id: I134fcd9781024dcb6781297d02645f5fb9befb18
2023-06-27 04:46:50 +00:00
Jooyung Han
2ac1f2fabc Deprecate flattened apexes
Flattened apexes are deprecated. mege_dexopt does not need to care about
flattened apexes.

Bug: 278826656
Test: m otapackage
Change-Id: I527eed64c5f1a7466e2c48d73360f47f6cfa0911
2023-06-27 13:01:56 +09:00
Xin Li
ea6caff90b [automerger skipped] Merge "Merge Android 13 QPR3" am: 24c928cda8 -s ours am: 8476205b04 -s ours am: 823af11644 -s ours am: 53b2cabdd2 -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: I7f3e7b322485548aaf7ef84464b67f7b31e7a910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:16:21 +00:00
Xin Li
d67e7d6870 [automerger skipped] Merge Android 13 QPR3 am: 7f534ea9b9 -s ours am: 420d124c7f -s ours am: 5f70b9bf78 -s ours am: f586549b0b -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: Ib80216d8a001909d7423bad01ce0400826524599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:14:21 +00:00
Xin Li
53b2cabdd2 [automerger skipped] Merge "Merge Android 13 QPR3" am: 24c928cda8 -s ours am: 8476205b04 -s ours am: 823af11644 -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: I52c0ef5b49c5f5c1f1d3345b8b9a75a80080cd92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:34:52 +00:00
Xin Li
f586549b0b [automerger skipped] Merge Android 13 QPR3 am: 7f534ea9b9 -s ours am: 420d124c7f -s ours am: 5f70b9bf78 -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: I2fdac253dd4639ad466768263f05018123b7db3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:32:50 +00:00
Treehugger Robot
e68480949f Merge "aconfig: add dump --format=textproto" am: 571cd07796 am: f29ee8722d am: 475043109a am: 40fe34bdc6 am: dc946e18fc
Original change: https://android-review.googlesource.com/c/platform/build/+/2637956

Change-Id: I8b8d19ba3516d7c82e4a87eb5b8147395c89ce26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:26:42 +00:00
Lukács T. Berki
cabf917c86 Merge "Change initialization message." am: 9235b7a2b4 am: b2ff7bf25e am: 06b0646b95 am: 860e332c5f am: fc00552609
Original change: https://android-review.googlesource.com/c/platform/build/+/2635674

Change-Id: I2d7fe40e8ca8c31ace793ed1a0fae327d900fcf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:23:17 +00:00