Commit Graph

96226 Commits

Author SHA1 Message Date
Treehugger Robot
a016367cdb [automerger skipped] Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main am: c5b4b824ae am: 18e2263dad am: d4fd7da76a -s ours
am skip reason: Merged-In Ib2170146d07763ff6c852ce810497ebe1ac2eead with SHA-1 a6d8073bcf is already in history

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

Change-Id: I8e20b760a36c7c294a1bbcb32de4299e220fa734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-14 00:24:36 +00:00
Treehugger Robot
d4fd7da76a Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main am: c5b4b824ae am: 18e2263dad
Original change: https://android-review.googlesource.com/c/platform/build/+/2909038

Change-Id: I9d711a9bcb05cca27f31157a4cdca758bd37e233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-13 23:42:36 +00:00
Treehugger Robot
18e2263dad Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main am: c5b4b824ae
Original change: https://android-review.googlesource.com/c/platform/build/+/2909038

Change-Id: I82a25486ae3bca7d7670581967c829e4c7badd05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-13 23:12:24 +00:00
Roshan Pius
7d26fd45c3 build: Set soong variable for enabling NFC apex bootclasspath fragment
Bug: 303286040
Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=NfcNci)
Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=com.android.nfcservices)
Change-Id: Ibd1e28c7b6bcbff81c98e6be91d6a11b1e3ab1ae
2024-01-13 14:53:41 -08:00
Treehugger Robot
c5b4b824ae Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main 2024-01-13 22:12:12 +00:00
Roshan Pius
dea4f88f91 Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main 2024-01-13 16:05:20 +00:00
Jihoon Kang
9c148dde67 Merge "Export RELEASE_HIDDEN_API_EXPORTABLE_STUBS to soong" into main am: d6c7dadbb5 am: 37457d7d38 am: f12a0f6259
Original change: https://android-review.googlesource.com/c/platform/build/+/2906339

Change-Id: I4fed0140b115b29da11bbdaef94e7261106c9db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-13 03:27:13 +00:00
Jihoon Kang
f12a0f6259 Merge "Export RELEASE_HIDDEN_API_EXPORTABLE_STUBS to soong" into main am: d6c7dadbb5 am: 37457d7d38
Original change: https://android-review.googlesource.com/c/platform/build/+/2906339

Change-Id: I82327b3b09abf3a6f89c1afa74be265c3661fc35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-13 02:18:39 +00:00
Roshan Pius
dbaddabffb build: Allow NFC stack to be delivered as a mainline module or APK
These changes are necessary to allow NFC stack delivery to be properly
trunk stable flagged:
1. Delivered as NfcNci.apk and framework-nfc.jar for Android
U based builds (existing).
2. Delivered as com.android.nfcservices.apex which embeds NfcNci.apk &
framework-nfc.jar for Android V based builds (new).

Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:046c1816091f9150c91953b8571dc946b0a59f86)
Merged-In: Ib2170146d07763ff6c852ce810497ebe1ac2eead

Change-Id: Ib2170146d07763ff6c852ce810497ebe1ac2eead
2024-01-12 18:17:26 -08:00
Roshan Pius
a6d8073bcf build: Allow NFC stack to be delivered as a mainline module or APK
These changes are necessary to allow NFC stack delivery to be properly
trunk stable flagged:
1. Delivered as NfcNci.apk and framework-nfc.jar for Android
U based builds (existing).
2. Delivered as com.android.nfcservices.apex which embeds NfcNci.apk &
framework-nfc.jar for Android V based builds (new).

Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
Change-Id: Ib2170146d07763ff6c852ce810497ebe1ac2eead
2024-01-12 18:15:34 -08:00
Jihoon Kang
37457d7d38 Merge "Export RELEASE_HIDDEN_API_EXPORTABLE_STUBS to soong" into main am: d6c7dadbb5
Original change: https://android-review.googlesource.com/c/platform/build/+/2906339

Change-Id: Icfaa814f0ecf48819a7cf0775a6e7130e257da4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-13 01:33:08 +00:00
Devin Moore
a1339afbb3 Add new function to create a new compat matrix for finalization
Creates the next version of the file based on the previous.
Replaces the "level" value with the new one in the file.
Adds a new Android.bp module that inherits from the previous.
Adds the current matrix file unconditional to all builds.
Adds the new matrix file contintionally based on release config.
This is used in finalize-vintf-resources.sh.

Ignore-AOSP-First: b/304316873#comment10

Test: ./finalize-vintf-resources.sh
Bug: 279809333
Change-Id: Ic14b3b82a33af3cce7a738dce5ad48112b8fb33d
2024-01-13 00:21:44 +00:00
Jihoon Kang
d6c7dadbb5 Merge "Export RELEASE_HIDDEN_API_EXPORTABLE_STUBS to soong" into main 2024-01-12 23:50:37 +00:00
Dennis Shen
931c5de0f9 Merge "aconfig: create flag value file" into main am: 12eacc1e4e am: 2ed4060eb8 am: 3ab524979a
Original change: https://android-review.googlesource.com/c/platform/build/+/2901788

Change-Id: I6ef2762c01d75a5935552408319aa533a11a15ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 21:35:51 +00:00
Luca Farsi
88f4a35f5f Merge "Add a script to optimize Test Mapping builds" into main am: f88ce5a619 am: 15725c51f6 am: 5a90175197
Original change: https://android-review.googlesource.com/c/platform/build/+/2892203

Change-Id: I0ed5c3932183b3580a7e1fd9aefc80a1f3a6edd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 21:24:15 +00:00
Dennis Shen
c39f3781b8 build system to create flag storage files per partition
Add make file targets to create storage files. Note the container field
to aconfig command is an empty string for now as flags now by default
assumes empty container string in parsed_flag proto. Need to update it
once the container specification to aconfig files are done.

Bug: b/312239352
Test: m
Change-Id: If7bd12be5917a4779047633c00f88166574bfe0b
2024-01-12 20:21:21 +00:00
Dennis Shen
3ab524979a Merge "aconfig: create flag value file" into main am: 12eacc1e4e am: 2ed4060eb8
Original change: https://android-review.googlesource.com/c/platform/build/+/2901788

Change-Id: If96fc80917a97e20e09d405610e58d932afe7622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 19:33:43 +00:00
Luca Farsi
5a90175197 Merge "Add a script to optimize Test Mapping builds" into main am: f88ce5a619 am: 15725c51f6
Original change: https://android-review.googlesource.com/c/platform/build/+/2892203

Change-Id: I8c4a464cc19a49072bf7470ddc0f82153033c485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 19:33:14 +00:00
Luca Farsi
212d38662b Add dexpreopt option to build commands
Missed passing down the WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
option in the build commands.

Test: ./build/make/ci/build_test_suites --target_product aosp_x86_64
--target_release trunk_staging --with_dexpreopt_boot_img_and_system_server_only --dist_dir <dist_dir> --change_info <change_info_file> <extra_targets>
Bug: 314171817

Change-Id: I0424e8b7ef350b3baff76ff9bcb8255c914fee5a
2024-01-12 11:24:25 -08:00
Dennis Shen
2ed4060eb8 Merge "aconfig: create flag value file" into main am: 12eacc1e4e
Original change: https://android-review.googlesource.com/c/platform/build/+/2901788

Change-Id: I41eb7b32c3a15ed67a1c6d921c153a7fc576a140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 19:02:48 +00:00
Luca Farsi
15725c51f6 Merge "Add a script to optimize Test Mapping builds" into main am: f88ce5a619
Original change: https://android-review.googlesource.com/c/platform/build/+/2892203

Change-Id: I22b5cc249275505134ce5016595be24f58d9caae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 19:01:49 +00:00
Dennis Shen
12eacc1e4e Merge "aconfig: create flag value file" into main 2024-01-12 18:37:53 +00:00
Luca Farsi
f88ce5a619 Merge "Add a script to optimize Test Mapping builds" into main 2024-01-12 18:13:15 +00:00
Treehugger Robot
14548bbe85 Merge "aconfig: update cache arg to support multiple cache files" into main am: 45db966e90 am: c92f754bb5 am: a8864899db
Original change: https://android-review.googlesource.com/c/platform/build/+/2907195

Change-Id: Id03c7e35c151dec89af56cf1db75172070b21754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 17:08:03 +00:00
Treehugger Robot
a8864899db Merge "aconfig: update cache arg to support multiple cache files" into main am: 45db966e90 am: c92f754bb5
Original change: https://android-review.googlesource.com/c/platform/build/+/2907195

Change-Id: Ie189bcecf2eeabb57b8a2d10f5e88c87434bfde0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 16:19:28 +00:00
Treehugger Robot
c92f754bb5 Merge "aconfig: update cache arg to support multiple cache files" into main am: 45db966e90
Original change: https://android-review.googlesource.com/c/platform/build/+/2907195

Change-Id: If9d70227202295af32d241ea7ff0eafa47954bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 15:49:40 +00:00
Treehugger Robot
45db966e90 Merge "aconfig: update cache arg to support multiple cache files" into main 2024-01-12 14:28:19 +00:00
Dennis Shen
d4ea260758 aconfig: create flag value file
Create flag_value module to create flag value file. Flag value file
contains a header section at the start of the file, followed by a
boolean array.

Bug: b/312243587
Test: atest aconfig.test
Change-Id: If76660189d63073fbd477e1e447240e0cd029604
2024-01-12 13:44:51 +00:00
Treehugger Robot
4d3a7d65b9 Merge "aconfig: Print flags with namespace, and sort them" into main am: 375cb9ab07 am: 6a60a97bd4 am: 571913f617
Original change: https://android-review.googlesource.com/c/platform/build/+/2874915

Change-Id: I5e08efff790d60cd63cef9d2bdc6ba7ce0ca954a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 07:31:26 +00:00
Treehugger Robot
3cb8c3da53 Merge "Remove last reference to SOONG_COLLECT_JAVA_DEPS" into main am: a2fc52954e am: ba4381a654 am: 20f7c524bb
Original change: https://android-review.googlesource.com/c/platform/build/+/2901259

Change-Id: I685e9f1294868b48f19c949f2326666215113e58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 07:29:16 +00:00
Treehugger Robot
571913f617 Merge "aconfig: Print flags with namespace, and sort them" into main am: 375cb9ab07 am: 6a60a97bd4
Original change: https://android-review.googlesource.com/c/platform/build/+/2874915

Change-Id: I31124ea6d3506fad943c1fcd4e1bfccae7733cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 06:59:21 +00:00
Treehugger Robot
20f7c524bb Merge "Remove last reference to SOONG_COLLECT_JAVA_DEPS" into main am: a2fc52954e am: ba4381a654
Original change: https://android-review.googlesource.com/c/platform/build/+/2901259

Change-Id: Id5528dcdbe7b1b3fa8f0457863c32d902512c1bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 06:56:37 +00:00
Treehugger Robot
6a60a97bd4 Merge "aconfig: Print flags with namespace, and sort them" into main am: 375cb9ab07
Original change: https://android-review.googlesource.com/c/platform/build/+/2874915

Change-Id: I53c30ed609b381cfe029a059aa6c8aee16a8b9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 05:40:05 +00:00
Treehugger Robot
ba4381a654 Merge "Remove last reference to SOONG_COLLECT_JAVA_DEPS" into main am: a2fc52954e
Original change: https://android-review.googlesource.com/c/platform/build/+/2901259

Change-Id: I32abce64a739e33925d1ad0ffec5b5eac24ad464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 05:37:19 +00:00
Treehugger Robot
375cb9ab07 Merge "aconfig: Print flags with namespace, and sort them" into main 2024-01-12 04:31:30 +00:00
Treehugger Robot
a2fc52954e Merge "Remove last reference to SOONG_COLLECT_JAVA_DEPS" into main 2024-01-12 04:28:49 +00:00
Jihoon Kang
e0f37a7511 Export RELEASE_HIDDEN_API_EXPORTABLE_STUBS to soong
This change exports the build flag RELEASE_HIDDEN_API_EXPORTABLE_STUBS
so that it can be utilized in the bp file.

Test: m nothing
Bug: 315027929
Change-Id: I7b7b2658498ef8a84eb2de428c0c78b0f2215704
2024-01-12 01:11:11 +00:00
Luca Farsi
5717d6f2db Add a script to optimize Test Mapping builds
Move the test build command to a script that lives in-source and
intended to be called by the Android CI build system.

This script optimizes the build when change information is available by
only building relevant test modules. More specifically, only 'affected'
test modules listed in Test Mapping configuration files are built.

Using this script is expected to reduce build times and generate a
smaller `general-tests.zip` file which had increased to over 30 GB.

Test: ./build/make/ci/build_test_suites --target_product aosp_x86_64
--target_release trunk_staging --with_dexpreopt_boot_img_and_system_server_only --dist_dir <dist_dir> --change_info <change_info_file> <extra_targets>
Bug: 314171817

Change-Id: Ie2f8c066f5dd1cd13454141e55956328303fd79d
2024-01-11 16:17:36 -08:00
Dennis Shen
b04919399d Merge "aconfig: add flag type in flag table and remove info byte from value array" into main am: 88ec7f624f am: ca09d7160b am: c0f4fb73c7
Original change: https://android-review.googlesource.com/c/platform/build/+/2902907

Change-Id: I821a73578a62ef1d80a441a7b847442b70fcc4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11 20:52:19 +00:00
Dennis Shen
c0f4fb73c7 Merge "aconfig: add flag type in flag table and remove info byte from value array" into main am: 88ec7f624f am: ca09d7160b
Original change: https://android-review.googlesource.com/c/platform/build/+/2902907

Change-Id: I17dfc10a243b8ea49e4e7e38980d3b9d351d3670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11 20:03:50 +00:00
Dennis Shen
ca09d7160b Merge "aconfig: add flag type in flag table and remove info byte from value array" into main am: 88ec7f624f
Original change: https://android-review.googlesource.com/c/platform/build/+/2902907

Change-Id: I178a1994647816f5ee3af376cd55a5f3e40841c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11 19:35:26 +00:00
Dennis Shen
88ec7f624f Merge "aconfig: add flag type in flag table and remove info byte from value array" into main 2024-01-11 18:43:18 +00:00
Dennis Shen
54b8195d00 Merge "aconfig: remove debug print out" into main am: ccec070038 am: 95d402514e am: 4a2a198cf7
Original change: https://android-review.googlesource.com/c/platform/build/+/2905247

Change-Id: Ia8c76f3b54b7f81c4feffec404d75dec19bcd63b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11 17:26:10 +00:00
Dennis Shen
cfb65827d8 aconfig: update cache arg to support multiple cache files
Bug: b/312243587
Test: atest aconfig.test
Change-Id: I6f5f9b5ca6e2a60b8aac9ea8bf3032b00b7af7da
2024-01-11 17:13:39 +00:00
Tongbo Liu
5a59dd91ef Merge "Modify the build rule of MTS and MCTS related tests in order to enable module individual MTS/MCTS test suites to be ran." into main 2024-01-11 16:57:51 +00:00
Dennis Shen
4a2a198cf7 Merge "aconfig: remove debug print out" into main am: ccec070038 am: 95d402514e
Original change: https://android-review.googlesource.com/c/platform/build/+/2905247

Change-Id: Ib503b6f3823b0e646461cf7bfbe114a5da31205c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11 16:38:21 +00:00
Dennis Shen
95d402514e Merge "aconfig: remove debug print out" into main am: ccec070038
Original change: https://android-review.googlesource.com/c/platform/build/+/2905247

Change-Id: I316fb21e555ed441cbca75589e1611e667593216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11 16:08:35 +00:00
Dennis Shen
d088650481 aconfig: add flag type in flag table and remove info byte from value
array

1, add flag type to the flag table. Before flag table only stores the
mapping from (package id, flag name) to (flag id u32). The original
intent is to do bitmasking on the top byte of flag id to indicate flag
type. Now split the flag id u32 to two u16, the first represent flag
type, the second represent flag id. So after the change, the flag table
now shows the following mapping:

(package id, flag name) -> (flag type as u16, flag id as u16)

2, originally we plan to store a info byte together with each flag
value. The info byte is used by storage service damemon to mark up the
flag status, such as if it is accepting server side flag push. After
internal discussion, it is better to just create the info bytes as
another file by storage service damemon. So that the value file is
purely a flag value array.

Bug: b/312243587
test: atest aconfig.test
Change-Id: I7f953076b4269cf786bc23723078290e5ebe10bc
2024-01-11 15:30:10 +00:00
Dennis Shen
ccec070038 Merge "aconfig: remove debug print out" into main 2024-01-11 15:02:43 +00:00
Aditya Choudhary
9f6a0f1dfa Metadata tool correction: Output empty proto in case of no input
Ignore-AOSP-First: CPing test_spec rule to udc-mainline-prod to support migration of test targets. Cherry pick of:aosp/2906355

Change-Id: I85ca22574433ab164c303c1f6b0d29191e704cbb
Merged-In: I85ca22574433ab164c303c1f6b0d29191e704cbb
2024-01-11 14:20:24 +00:00