Commit Graph

85413 Commits

Author SHA1 Message Date
Steve Berbary
fecfd0e585 Update Security String to 2023-07-05
Bug: 282371465
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d6c119bfaa2b768070bda5e0d9c71806d83b7e39)
Merged-In: I2bb1848e16aff436787a5bf43dbea18012d485a7
Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
2023-05-27 17:11:57 +00:00
Dan Shi
1e4d747628 Support test runnner option in auto generated test configs
Bug: 284179405
Bug: 236980335
Test: unittest
Change-Id: I7f96a2a2bc52316888e87af7e4bcc4ef50863716
2023-05-26 21:35:10 +00:00
Mårten Kongstad
00cf045c85 aconfig: restrict valid namespace and flag names
The namespace and flag names will be used as identifiers in the
auto-generated code. Place restrictions on what constitutes a valid
name.

Valid identifiers are those that match /[a-z][a-z0-9_]/. aconfig
explicitly does not implement any automatic translation to make names
valid identifiers: this sidesteps potential conflicts such as "foo.bar"
and "foo_bar" mapping to the same name if dots were translated to
underscores.

Bug: b/284252015
Test: atest aconfig.test
Change-Id: I38d005a74311e5829e540063404d1565071e6e96
2023-05-26 17:09:10 +02:00
Mårten Kongstad
5c2756c13a Merge changes from topic "aconfig-create-rust-lib" am: aa977fb083
Original change: https://android-review.googlesource.com/c/platform/build/+/2602726

Change-Id: I2e708156312d2274c430a698b983b5cfe73c20ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:08:20 +00:00
Mårten Kongstad
aa977fb083 Merge changes from topic "aconfig-create-rust-lib"
* changes:
  aconfig: first iteration of Rust codegen
  aconfig: improve dump --format=debug output
2023-05-26 06:00:47 +00:00
Android Build Coastguard Worker
4eaa5d6aa6 [coastguard skipped] Merge sparse cherrypicks from sparse-10204971-L19600000960914226 into tm-qpr3-release.
COASTGUARD_SKIP: I5042629af3bcce0a6da9180ca2a7de6226937567

Change-Id: Ib6f6743344953ca3aea9340b7f6121f1abb5d4c5
2023-05-25 23:01:20 +00:00
Android Build Coastguard Worker
aec6ac42f9 Version bump to TQ3A.230605.012.A1 [core/build_id.mk]
Change-Id: I5042629af3bcce0a6da9180ca2a7de6226937567
2023-05-25 22:57:42 +00:00
Android Build Coastguard Worker
ca8fe47fab Version bump to TQ3A.230605.012 [core/build_id.mk]
Change-Id: Ie750c185483bcd4a9ed47d10793e698ef8201cfc
2023-05-25 19:20:02 +00:00
Spandan Das
3639919c3b Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" am: 90673eb224
Original change: https://android-review.googlesource.com/c/platform/build/+/2601327

Change-Id: I46fa139988d8170231cca15c8421248a1efc480c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 17:34:34 +00:00
Spandan Das
90673eb224 Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" 2023-05-25 16:46:42 +00:00
Mårten Kongstad
f73b963283 aconfig: first iteration of Rust codegen
Add a new `create-rust-lib` command to generate Rust code. The output is
a src/lib.rs file; the build system is assumed to set the generated
crate's name.

For READ_ONLY flags, the generated code returns a hard-coded true or false.

For READ_WRITE flags, the generated code reaches out to DeviceConfig via
the cc_library server_configurable_flags via the
libprofcollect_libflags_rust Rust bindings. The build system is assumed
to add this to the generated crate's dependencies.

Note: libprofcollect_libflags_rust seems generic enough that it should
be moved to an official Rust wrapper for server_configurable_flags. This
is tracked in b/284096062.

Summary of module the built system is assumed to wrap the auto-generated
code in:

  rust_library {
      name: "lib<namespace>_rs",
      crate_name: "<namespace>_rs",
      edition: "2021",
      clippy_lints: "none",
      no_stdlibs: true,
      lints: "none",
      srcs: ["src/lib.rs"],
      rustlibs: [
          "libprofcollect_libflags_rust",
      ],
  }

Also add a set of test input to be used in the unit tests for a more
coherent test strategy. A follow-up CL will migrate the code in
commands.rs, codegen_java.rs and codegen_cpp.rs.

Bug: 279483360
Bug: 283907905
Test: atest aconfig.test
Test: manual: create cache from files in testdata, create rust lib, add to module template above, verify the module builds
Change-Id: I02606aa3686eda921116e33f7e2df8fd1156a7aa
2023-05-25 16:18:59 +02:00
Treehugger Robot
b7bf0eb30b Merge "Add a copy of AB OTA partition list prop in vendor partition" am: 6f74957c19
Original change: https://android-review.googlesource.com/c/platform/build/+/2595649

Change-Id: Ia7bf4f85f58b628bc94b37610fca072bfc44d302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 11:38:09 +00:00
Treehugger Robot
592ad2cb13 Merge "Fix merge_target_files in GRF case" am: b3adc24301
Original change: https://android-review.googlesource.com/c/platform/build/+/2564310

Change-Id: I564bb6d43bfa5b9cb79463f0ba50038d03ef6abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 11:37:45 +00:00
Treehugger Robot
6f74957c19 Merge "Add a copy of AB OTA partition list prop in vendor partition" 2023-05-25 11:14:40 +00:00
Treehugger Robot
b3adc24301 Merge "Fix merge_target_files in GRF case" 2023-05-25 10:46:32 +00:00
Nikolas Havrikov
15ba4a9bc6 Do not include SoundPicker on Android TV
This CL leverages the PRODUCT_IS_ATV build time variable to selectively
exclude the SoundPicker package from the PRODUCT_PACKAGES. This also
paves the way to approach the removal of other unused packages from TV.

Bug: 276897441
Test: make
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:413b614d0d7bc1b412c87672f995fabfadbb6bc8)
Merged-In: Ifb25c1f26df545d31fb80f8e43c217fa8806e021
Change-Id: Ifb25c1f26df545d31fb80f8e43c217fa8806e021
2023-05-25 09:00:18 +00:00
Treehugger Robot
6c716889f9 Merge "Support dynamic 64-bit drmserver" am: 95ad4d4ba0
Original change: https://android-review.googlesource.com/c/platform/build/+/2588496

Change-Id: I05f061809b34064602aaec04e3403890f8b7c739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 02:46:47 +00:00
Treehugger Robot
95ad4d4ba0 Merge "Support dynamic 64-bit drmserver" 2023-05-25 02:22:45 +00:00
Kelvin Zhang
ef158a9a51 Add a copy of AB OTA partition list prop in vendor partition
The sysprop to enable/disable AB OTA update is in vendor partition,
but the sysprop which stores list of AB partitions is in product(which
is on system side of treble boundary). This is inconsistent and might
cause problems during mixed build. To mitigate, add a copy of AB
partition list prop in vendor, and readers of this prop will prefer the
vendor copy instead.

Bug: 283042235
Test: th
Change-Id: Idd73971817f663b08824e285d840ed8d8dd60d2c
2023-05-24 18:26:27 -07:00
Android Build Coastguard Worker
2c2bcb61c7 [coastguard skipped] Merge sparse cherrypicks from sparse-10121037-L10400000960889242 into tm-qpr3-release.
COASTGUARD_SKIP: I864a4057004570f5efeb4c90d06cf26da89cb1bc

Change-Id: I7349ee8437d5b8a9c25ac74f7c34ef35e88b9758
2023-05-25 01:05:30 +00:00
Android Build Coastguard Worker
52ea1d197c Version bump to TQ3A.230605.010.A1 [core/build_id.mk]
Change-Id: I864a4057004570f5efeb4c90d06cf26da89cb1bc
2023-05-25 00:58:16 +00:00
Mårten Kongstad
993111f91c aconfig: improve dump --format=debug output
Use Rust's {:#?} formatter for more readable output.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I127f413e3d7aebfba96cad1dd58d9e261dd613a4
2023-05-24 14:56:45 +02:00
Vinh Tran
4f86347cdd Merge "Support sandboxing genrule" am: 2c5fb95f32
Original change: https://android-review.googlesource.com/c/platform/build/+/2585206

Change-Id: Iafc5c069b70153ee24b721c8bf4c806c0bbbbc51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 21:47:27 +00:00
Vinh Tran
2c5fb95f32 Merge "Support sandboxing genrule" 2023-05-23 21:29:27 +00:00
Treehugger Robot
74ad39125c Merge "Unsparse images before generating OTA" am: b4406d06f0
Original change: https://android-review.googlesource.com/c/platform/build/+/2598008

Change-Id: I40ac20dd7b30d11e1eda77688718566af4c1c416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 21:22:54 +00:00
Treehugger Robot
b4406d06f0 Merge "Unsparse images before generating OTA" 2023-05-23 20:51:10 +00:00
Spandan Das
2e69ea6228 Create default PRODUCT_INCLUDE_TAGS in product_config
In the current setup in partner branch, we
1. Add blueprint_package_includes to prebuilts/module_sdk/*
2. Add the correct PRODUCT_INCLUDE_TAGS to partner_modules

This means in those setups,none of the prebuilts are visible to aosp products since
they they do not inherit partner_module makefiles.
```
e.g.
prebuilts/module_sdk/art/current/Android.bp
prebuilts/module_sdk/art/<go_specific>/current/Android.bp

// aosp_arm cannot find either

```

To solve this, this CL creates a default inclusion tag for all products
that do not set any PRODUCT_INCLUDE_TAGS explicitly.
In the previous example, Soong analysis of aosp_* will use
prebuilts/module_sdk/art/current/Android.bp. This should be a no-op for
aosp and internal branches since none of the Android.bp files today contains
blueprint_package_includes

Test: m nothing for aosp_arm in the test branch of b/278604467#comment20
Test: m nothing for partner product that uses big android sdk
Test: m nothing for partner product that uses go sdk

Bug: 278604467
Change-Id: I322b52c34ed339989207609dd0fd23c27ed1f697
2023-05-23 20:01:39 +00:00
Treehugger Robot
43201c9e99 Merge "Add BUILD_BROKEN_PLUGIN_VALIDATION flag" am: 2014bbb8e7
Original change: https://android-review.googlesource.com/c/platform/build/+/2595975

Change-Id: I326eafff5ddf8197c9f4dc9906aafdaecd93d1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:13:29 +00:00
Treehugger Robot
23f56b980e Merge "Update vndk with update-vndk-list.sh" am: 910393d5a3
Original change: https://android-review.googlesource.com/c/platform/build/+/2599605

Change-Id: Ia1900ade879f7647dd38310583362c92c7f18d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:11:46 +00:00
Treehugger Robot
2014bbb8e7 Merge "Add BUILD_BROKEN_PLUGIN_VALIDATION flag" 2023-05-23 17:08:46 +00:00
Treehugger Robot
910393d5a3 Merge "Update vndk with update-vndk-list.sh" 2023-05-23 16:33:31 +00:00
Treehugger Robot
231a7e7741 Merge "Fix build error about jar manifest" am: 27efd6e1eb
Original change: https://android-review.googlesource.com/c/platform/build/+/2599886

Change-Id: Icce798dca20864e8901121de8f5c07162b0c3703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 13:19:03 +00:00
Treehugger Robot
27efd6e1eb Merge "Fix build error about jar manifest" 2023-05-23 12:44:10 +00:00
Treehugger Robot
5ad4cff1cb Merge changes from topic "b/278060169" am: 2231df8a54
Original change: https://android-review.googlesource.com/c/platform/build/+/2599485

Change-Id: I6099574659b1880f4be6f8a8e4557b171863f9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:28:09 +00:00
Jeongik Cha
f295008821 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: 05210f96b3
Original change: https://android-review.googlesource.com/c/platform/build/+/2563995

Change-Id: Ieaa619837f1c212265075ea59ddc74be34afd783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:28:02 +00:00
Treehugger Robot
2231df8a54 Merge changes from topic "b/278060169"
* changes:
  Replace touch -a with comment
  BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
2023-05-23 08:56:48 +00:00
Jeongik Cha
7e00234b84 Fix build error about jar manifest
It still depended on old intermediate files (out/host/common/obj/JAVA_LIBRARIES/<modulename>_intermediates//manifest.mf)
But the intermediate manifest.mf isn't created after aosp/2563995,
it causes merge_zip error due to missing file.
So make it use the manifest file from source directly.

Test: m out/host/common/obj/JAVA_LIBRARIES/ahat-tests_intermediates/classes-combined.jar
Bug: 278060169
Bug: 283821744
Bug: 283903672
Change-Id: Iebff6bf90b93dab693aef2492383cd3b03f239fb
2023-05-23 05:59:09 +00:00
Treehugger Robot
f6d61bd3c1 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" am: 8485145bd7
Original change: https://android-review.googlesource.com/c/platform/build/+/2595883

Change-Id: I36815cfa877645e242d40a3b4b4cadd0e50a6ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 03:30:56 +00:00
Treehugger Robot
8485145bd7 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" 2023-05-23 02:36:17 +00:00
Devin Moore
2ea277dbce Update vndk with update-vndk-list.sh
libdiskconfig has been removed.

Test: m
Bug: 280829178
Change-Id: I58948c92012501f2666c8c2b6a99343a141ad1d0
2023-05-23 00:34:09 +00:00
Jeongik Cha
54403316c0 Replace touch -a with comment
Bug: 278060169
Test: m
Change-Id: Ie5ad1b5c6cf335cc3de641fd76a76bfa5f3f79cb
2023-05-23 07:14:51 +09:00
Jeongik Cha
05210f96b3 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
2023-05-23 07:14:22 +09:00
Anton Hansson
9ef02252a6 Merge "Don't add build ID to version name" am: 08b97147ac
Original change: https://android-review.googlesource.com/c/platform/build/+/2594246

Change-Id: I601913fd85a87ffebc248845bc77a4ecbd78c66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:16:39 +00:00
Anton Hansson
08b97147ac Merge "Don't add build ID to version name" 2023-05-22 17:43:10 +00:00
Kelvin Zhang
2268091521 Unsparse images before generating OTA
Test: th
Bug: 283172692
Change-Id: Ie6d3dc704fd9a8c107e2888222e4c2bf804dad3e
2023-05-22 10:22:59 -07:00
Matthew Sedam
cfc47399f1 Merge "Fix small spelling error in build/core/main.mk" am: d104c386f6
Original change: https://android-review.googlesource.com/c/platform/build/+/2597518

Change-Id: I85adc59cbb50530251748c17a3c2a64604e85bb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:14:07 +00:00
Matthew Sedam
d104c386f6 Merge "Fix small spelling error in build/core/main.mk" 2023-05-22 15:45:43 +00:00
Treehugger Robot
1ad09e0bfa Merge changes from topic "aconfig-stable-flag-order" am: f469fd6cc6
Original change: https://android-review.googlesource.com/c/platform/build/+/2595206

Change-Id: Ic66ea4047487b6f8c4c51237bf583d035b7032d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 12:30:11 +00:00
Treehugger Robot
f469fd6cc6 Merge changes from topic "aconfig-stable-flag-order"
* changes:
  aconfig: sort items in cache by name
  aconfig: dump: support multiple caches
2023-05-22 12:15:06 +00:00
Mårten Kongstad
2f95444281 aconfig: sort items in cache by name
Introduce a builder pattern for constructing a cache from flag
declarations and flag values. Teach the builder to sort the flags by
name as the last step. This will ensure consistent dump output
regardless of the order flags are specified in the input files.

Bug: 279485059
Test: atest aconfig.test
Change-Id: Icdd62f51fa3761a469663f17581a83d9909e9ffe
2023-05-22 10:01:05 +02:00