Commit graph

96712 commits

Author SHA1 Message Date
Spandan Das
d22b1390b9 Make system_server.zip compatible with prebuilt apex builds
This artifact contains the system server jars that were used in the
build. At ToT, this was disabled when prebuilts were enabled to prevent
version skew between the system server jars built from source, and the
system server jars deapexed from the prebuilt apex that was installed
into the system image.

With this CL, this artifact is now compatible with prebuilts. If a
google prebuilt apex is used, system_server.zip will contain the .jar
deapexed from that prebuilt. e.g. if art _and_ btservices prebuilts are
enabled, then system_server.zip will contain the prebuilt jars for those
apexes, and sources for others.

This implementation leverages the fact that soong copies the _selected_
system server jars to out/soong/system_server_dexjars for dex2oat. Soong
is aware of source/prebuilts, and populates this directory with the
correct system server jar.

One side effect of this change is that affects the directory structure
of the zip. Previously, service-art.jar will be present in the zip file
at apex/com.android.art/java/service-art.jar. After this change
service-art.jar will be present in the top-level directory of the zip

Bug: 308188056
Test: the zip is not bit-identical, but I checked that the file contents are indentical (discussed below)
Test: unzip out/target/product/vsoc_x86_64/system_server.zip.before -d system_server.before
Test: unzip out/target/product/vsoc_x86_64/system_server.zip.before -d system_server.after
Test: find system_server.before/ -type f -printf '%s\t%p\n' | sort -n | cut -f2- | xargs cat | shasum
Test: find system_server.after/ -type f -printf '%s\t%p\n' | sort -n | cut -f2- | xargs cat | shasum
Test: the shasums are identical

Test: in internal, lunch cf_x86_64_phone-next-userdebug (next uses bt
prebuilts)
Test: m nothing
Test: aninja -t path out/target/product/vsoc_x86_64/system_server.zip <vendor_dir_path>/BluetoothGooglePrebuilt/com.google.android.btservices.apks; path exists

Change-Id: I213150b7ee2b012fd649b308f3c72bebf5ca7bf8
2024-04-26 16:43:52 +00:00
Ben Fennema
c6e4a86b03 Merge "Allow boot_variable_file to be read from input_target_files" into main 2024-04-25 17:11:20 +00:00
Ben Fennema
cd6de1bc7f Allow boot_variable_file to be read from input_target_files
If boot_variable_file is not found locally, look for it inside
input_target_files.

Bug: 335732867
Test: generate OTA with file in target-files.zip and verify metadata
Change-Id: I2e61f50850e82a3795f2e0e1aefcaf2329a8cfb1
2024-04-25 17:11:13 +00:00
Ted Bauer
966e558e9f Merge "Prune unnecessary symbols from read API" into main 2024-04-25 16:59:05 +00:00
Dennis Shen
489b828297 Merge "aconfig: update aconfig storage write api and test update" into main 2024-04-25 15:58:44 +00:00
Ted Bauer
ad07bd54f6 Prune unnecessary symbols from read API
Bug: 328444881
Test: m
Change-Id: I3b730a6c3390a5d116d467f15f17e74a9096961d
2024-04-25 15:51:15 +00:00
Dennis Shen
fe5065705c aconfig: update aconfig storage write api and test update
Simplify storage write api so that we don't need the storage records pb
file.

Bug: b/312444587
Test: atest -c
Change-Id: I7e336b1d7766983364715dae15786b91b0c0743f
2024-04-25 13:40:07 +00:00
Wei Li
5deb660e32 Merge "Add license metadata declarations which are moved from device/google/coral/Android.mk." into main 2024-04-25 07:15:52 +00:00
Treehugger Robot
83f8fb1643 Merge "Add appcompat system properties flag to soong" into main 2024-04-24 22:35:37 +00:00
Treehugger Robot
b2050366ef Merge "Allow specifying load order for 16K kernel modules" into main 2024-04-24 22:07:34 +00:00
Wei Li
8edc560eda Add license metadata declarations which are moved from device/google/coral/Android.mk.
Bug: 336592724
Test: CIs
Change-Id: Ifa586648ec2d25cc4f122ad84894e21fc8acebe5
2024-04-24 19:36:23 +00:00
Fabián Cañas
e0c74fbdd6 Merge "Add --unused parameter to whichgit" into main 2024-04-24 13:11:08 +00:00
Treehugger Robot
6916e64027 Merge "Make check-flagged-apis executable" into main 2024-04-24 08:41:07 +00:00
Anna Bauza
27abc3abc3 Merge "Adding avatar picker to install on all platform phones and tablets" into main 2024-04-24 08:03:32 +00:00
Treehugger Robot
7123699d09 Merge "Drop INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES" into main 2024-04-24 01:30:43 +00:00
Fabián Cañas
97ea68aea6 Add --unused parameter to whichgit
The --unused parameter inverts the output of whichgit, reporting which
git projects are not used for a given build target.

Test: build/make/tools/whichgit --unused
Test: build/make/tools/whichgit --unused --modules framework

Existing use-cases should remain unchanged:

Test: build/make/tools/whichgit --modules framework
Change-Id: Ia4e55a5cb0331d522fed76821fe813ef98c25a67
2024-04-23 21:28:29 -04:00
Spandan Das
8ec0862bdd Drop INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES
This list is used to create soong config namespaces per toggle-able
module, and set source_build property. internal and partner branches now
use RELEASE_APEX_CONTRIBUTIONS_* for source vs selection, so remove this
mechanism to prevent confusing behaviors when these two mechanisms have
conflicting values.

`art_module.source_build` is a special-case which uses an additional variable
`ART_MODULE_SOURCE_BUILD`. This will be tracked in
https://r.android.com/3037396

Bug: 308188056
Test: presubmits
Test: downloaded this CL in v-aml branch, m
out/soong/prebuilt_info.json; file is identical

Merged-In: I3f9cbb24d6f3a7a0312683906826708147f469ee
Change-Id: I3f9cbb24d6f3a7a0312683906826708147f469ee
2024-04-24 00:44:59 +00:00
Michael Wright
c55d79b7c7 Make check-flagged-apis executable
Occasionally sourcing the script would close my overall shell when it
hit an error. By having it just be an executable script, this prevents
it from impacting a user's normal shell environment and can depend on it
always being bash, rather than whatever shell people happen to be using.

Bug: 334870672
Test: tools/check-flagged-apis/check-flagged-apis.sh
Change-Id: Ic46cb4fefdea8d51be018d4f7a92b0d9ca7e57b3
2024-04-24 01:05:49 +02:00
Ted Bauer
171944d88a Merge "Update aconfig storage deps for CPP codegen" into main 2024-04-23 22:56:50 +00:00
Nikita Ioffe
496a329bd0 Merge "Add PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION to _product_single_value_vars" into main 2024-04-23 22:13:30 +00:00
Spandan Das
e10c4f22b4 Merge "Remove conditional for artifact list" into main 2024-04-23 21:05:20 +00:00
Treehugger Robot
6974bbf7ee Merge "Update sdk finalizer to change soong instead of bazel" into main 2024-04-23 20:26:05 +00:00
Dennis Shen
59274f816c Merge "aconfig: remove cache filtering by container" into main 2024-04-23 20:17:35 +00:00
Michael Merg
c9d54b0877 Merge "Set enforce SOONG_GEN_COMPDB=1 when running soong for ide_query" into main 2024-04-23 19:59:04 +00:00
Spandan Das
b1654b9b56 Remove conditional for artifact list
The expanded list seems to be no longer required when using prebuilts.

Test: downloaded this CL in v-aml-prebuilt-dev
Test: lunch gsi_partner_arm-ap31-userdebug && m # no ninja analysis
error

Change-Id: I818191f36449032aee98879506c1e564fd0bc1b1
2024-04-23 19:56:54 +00:00
Jihoon Kang
ed37595aaf Update sdk finalizer to change soong instead of bazel
Update the map in soong instead of that in bazel

Bug: 315353489
Test: manual
Merged-In: I3a51be1119109d2a6cf3959bdc8a48192872580f
Change-Id: Ia61a17be4a7d85c00d2e9758ea2409019d451dfd
2024-04-23 19:53:46 +00:00
Nikita Ioffe
ed8bd8aaf4 Add PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION to _product_single_value_vars
Forgot to add it in aosp/3044155.

Bug: 325991735
Test: m
Change-Id: I21d08b85b25426e498fc90c90729f7cb01f1f9d1
2024-04-23 18:34:52 +00:00
Dennis Shen
67e44dd2c3 Merge "aconfig: update flag info storage file" into main 2024-04-23 18:08:13 +00:00
Ted Bauer
8d20d51bf8 Update aconfig storage deps for CPP codegen
Bug: 328444881
Test: m AconfigDemoActivity
Change-Id: I12d746d3270dce39533e1afd213343e232044161
2024-04-23 18:07:40 +00:00
Zhuoyao Zhang
73e96880ae Merge "Support tool event logging for ADB invocations" into main 2024-04-23 17:25:58 +00:00
Treehugger Robot
96407369b1 Merge "Add soong config variables for selinux" into main 2024-04-23 01:14:44 +00:00
Wei Li
7f2b0fe594 Merge "Add license metadata declarations." into main 2024-04-22 22:52:37 +00:00
William McVicker
adc3664dd2 Merge "Add new product property to detect if PAGE_SIZE is defined" into main 2024-04-22 18:30:04 +00:00
Anna Bauza
65d5e13e11 Adding avatar picker to install on all platform phones and tablets
Bug: b/306336441
Test: manual
Merged-In: Idb550019b13d47e7f0dc389030d508db7d1057f3
Change-Id: Idb550019b13d47e7f0dc389030d508db7d1057f3
2024-04-22 13:20:09 +00:00
Kelvin Zhang
980aded04f Allow specifying load order for 16K kernel modules
Test: th
Bug: 293313353
Change-Id: Iffd5f064973fc9a2503f2fde32bc1c6d548d9c33
2024-04-19 20:35:34 -07:00
Paul Duffin
1c4b50f8c4 Merge "Use new metalava jar-to-diff command" into main 2024-04-19 22:27:51 +00:00
Zhuoyao Zhang
fb19bf1b9f Merge "Add Trendy team for the run_tool_with_logging_test" into main 2024-04-19 22:23:16 +00:00
Dennis Shen
1ebcd017ae aconfig: remove cache filtering by container
No need for cache filtering based on container anymore. This is now
performed by build system automatically. The caches feed into storage
generation command are automatically filtered based on owning
container.

Bug: b/312444587
Test: atest aconfig.test
Change-Id: I44f3ac03d50b77a191a82ff7ed4d02766012492d
2024-04-19 21:44:32 +00:00
Nate Myren
eed5dcf31e Add appcompat system properties flag to soong
Bug: 331307495
Test: m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7e5f93f3cccdc38a25e6b9304752f0b2f7f8b0b9)
Merged-In: I554c499f6239e62c33640a81d9da73545fc7631b
Change-Id: I554c499f6239e62c33640a81d9da73545fc7631b
2024-04-19 19:07:40 +00:00
Zhuoyao Zhang
eebb0edb27 Add Trendy team for the run_tool_with_logging_test
Test: None
Bug: 331638854
Change-Id: I58e74d93428cf6b9d39d37995c8105dfe247d676
2024-04-19 18:12:25 +00:00
Zhuoyao Zhang
60dd9ddce9 Support tool event logging for ADB invocations
Note that tool logging is still disabled by default.
This change validates that the ADB shell function
does not break any user flows when integrated with
the logging facility.

Test: adb devices -l
Bug: 331638854
Change-Id: Ic27fd44c9385ca48df79f2d7570c037b6fe18232
2024-04-19 17:38:17 +00:00
Treehugger Robot
563a2f62c5 Merge "fixup! Support generating partial OTAs from extracted target_files" into main 2024-04-19 16:19:32 +00:00
Michael Wright
2d3e50527d Merge changes I8b5e2642,I0520ab0f into main
* changes:
  check-flagged-apis: add script to run tool on actual data
  check-flagged-apis: simplify unit test dependencies
2024-04-19 15:25:22 +00:00
Paul Duffin
56ac6da961 Use new metalava jar-to-diff command
Replaces the use of `--input-jar-file` and `--api-xml` with the newly
added `jar-to-diff` command.

Test: TARGETS=$(for i in api.xml system-api.xml module-lib-api.xml system-server-api.xml test-api.xml; do echo out/target/common/obj/$i; done)
      m $TARGETS
      # Diff $TARGETS with and without this change to make sure that
      # they are identical, which they are.
Change-Id: I6a78febb4b2e4d06a0b3aea29fb4a7f94c9ab9a4
2024-04-19 12:34:47 +01:00
Treehugger Robot
f8e79f113b Merge "Remove android.hardware.wifi from generic_system.mk" into main 2024-04-19 06:40:57 +00:00
Jihoon Kang
9328219ae3 Merge "Remove non existent snapuserd.recovery package" into main 2024-04-19 06:33:36 +00:00
Jihoon Kang
93e9197a66 Merge "Remove WallpaperPicker from aosp_product.mk" into main 2024-04-19 05:15:45 +00:00
Inseob Kim
77d1b94b9f Merge "Build etc/hosts with Soong" into main 2024-04-19 01:29:38 +00:00
Jim Tang
ccd1f73c5f Merge "Deprecate USE_PREBUILT_SDK_TOOLS_IN_PLACE" into main 2024-04-19 00:47:08 +00:00
Dennis Shen
6f4c692948 aconfig: update flag info storage file
previously we store three bits per flag: is sticky, is read write, has
override. so when a local override arrives, is sticky bit as well has
override bit are set to true. this becomes problematic when the local
override is removed. we are not sure if we should remove has override
bit as well (server override could still be in place).

therefore restructuring the flag info for each flag into new three bits:
is read write, has server override and has local override. so now server
override and local override bits are independent from each other.

Bug: b/312444587
Test: atest -c
Change-Id: I03b2bb7312480773236c95f2b39f2589fee41924
2024-04-18 21:22:49 +00:00