aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-15Snap for 8730993 from 1332595b84e5d13688288210b090fbb3a114e23e to ↵aml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I953fd99f8356f102a38466061f0bfd4f2df61cfc
2022-06-15Snap for 8727584 from d2345e0aafd80e49f73beea63c131145b034b8d2 to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I5d42d705d98d176a88bcabd66e12c43014d64a7e
2022-06-15Merge "Generating api diff files for each module sdk." am: 6e31252b35 am: ↵Gurpreet Singh
67a4838ca0 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120161 Change-Id: I0c68d177999eb95d033edc1fe6beeb8ac97172b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Optional modules need a module specific soong config variable am: d20edd6c69 ↵Paul Duffin
am: 8a3d8102d0 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120157 Change-Id: I3bc8189a6ca13da9a0ad6507064497d5e24a3259 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Revert "Generate soong_config_module_type inline in the snapshot" am: ↵Paul Duffin
e363782a5c am: b8132b4af7 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120162 Change-Id: I69cc10ea6a2b2eb3b38b443d611e04e8c2383363 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Generate soong_config_module_type inline in the snapshot am: d29f8e0597 am: ↵Paul Duffin
cb49a23528 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120156 Change-Id: Iade7593298e39172d4d711be30da272b3cecc092 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Merge "Remove NetworkPermissionConfig package" am: ↵Motomu Utsumi
2ec8e5cd49 am: aa72d8636b -s ours am skip reason: Merged-In I9d2ad14b594402492eb8f4a8df34fa616a542a0a with SHA-1 9ea376ddb2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2111384 Change-Id: I50c9dbe034d29de1edf44c6859e1e15bccea6ecf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Fix build_release comparison condition. am: 2c7c723d38 am: d9b1189262Gurpreet Singh
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120152 Change-Id: I2f42612b8c4628d010559c228e981286c52148ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Build scope targets corresponding to each module sdk. am: 571ce869cc am: ↵Gurpreet Singh
6225526452 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2102113 Change-Id: I8cdb839be74c4a9c8cf6f1b40467eb2607ceb552 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Formatting fix. am: 1ce8f0edaf am: d617385e76Gurpreet Singh
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2119230 Change-Id: I09848afd2dcfb1aa8072b7fed000f14fcec2cff9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Code refactoring to build targets in a separate method." am: ↵Treehugger Robot
c21ce9240c am: 6bc7c406f4 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2119227 Change-Id: I266e7d3420be8c43508334bf6c633ec4f5e3ca18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Added libarect_headers to the allowed list" am: 2e4c3506c8 am: 340768d6e3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2107155 Change-Id: I3f557fdf1164c6ca2fde3b4c28a11b0bde2c76b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Allow modules-utils-locallog to be used in modules am: bb370e35e3 am: 18a70c097cAnton Hansson
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2110527 Change-Id: I0a5f8d82c25c754476a02061b1d9815ece21e34a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Add default that supports dcla + r launched am: fc0ea40e8d am: 202b3d9245Liz Kammer
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2107284 Change-Id: I46624f28afb3635eba9d3148f93bd820d587f7b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Removed telephony apex" am: cdbe3e48aa am: ee6b4655afLing Ma
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2088246 Change-Id: Ibf628ad3766c14141fc57971a55d69e7748b2358 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Merge "Add NetworkStackApi34Shims to allowed deps" am: ↵Treehugger Robot
5b2bed281b am: 0b672a9748 -s ours am skip reason: Merged-In I8d10138e8a9d1c098972c8a89d59b92e13942e6f with SHA-1 96d353998b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2098752 Change-Id: I43fa02f711a618376c26446f45d9c97ba5fe94b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "mainline_modules_sdks: Remove legacy build support" am: 310b9f3650 ↵Paul Duffin
am: 565d719aaf Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2095744 Change-Id: I05d2a65f98a6f4b00596e34b33b5abdf5b766f52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update path to module SDKs" am: c3652a5c98 am: 3d124ca5c2Anton Hansson
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2096633 Change-Id: Ifd17b4e4951ea7268d8a45b387ccc22a978f1d04 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Merge "Make first_release required" am: 81e35e114c am: ↵Treehugger Robot
6ee7770361 -s ours am skip reason: Merged-In I151773f80e37a6dd7de7b6df9cfa3f0a624d38f4 with SHA-1 d3cceec723 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2096635 Change-Id: I0e031a1f74c12488b2894cab856dd16c04b241c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Remove unused generate_ml_bundle.sh am: dd74fc45a3 am: 713fc96a94Paul Duffin
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2096634 Change-Id: I49f231d8b4d2f086889cafde505c3c8b4724ec07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update allowed-deps after setting NN's min_sdk_version" am: ↵Jooyung Han
7d96e47a39 am: 00c9299a49 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2080163 Change-Id: I62a00b4c29907ea4145e72fca1bb02f629651444 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Add libldac in the apex available am: c2debcd803 am: e6e2bf385dWilliam Escande
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2088923 Change-Id: I89a8c83787b8ffe558c755e350db8949925929f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Default-on strict updatability linting for Modules" am: 9dd7b86aab ↵Anton Hansson
am: b40be428ee Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2079464 Change-Id: I692a6db84294890d181ad3bfa5798b7132793213 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Add netd_aidl_interface-V9-ndk and netd_aidl_interface-V9-java" am: ↵Treehugger Robot
2984eb40b0 am: 14c63a1587 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2076482 Change-Id: Ie5e21b40af6bf46d727ce66dc2141ccc33c99b2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14[automerger skipped] Address review comments on finalize_sdk.py am: ↵Anton Hansson
22a794f499 am: c0eddbd80a -s ours am skip reason: Merged-In I919c3d37916d3854cd0c8d59fddb8a1420f429b9 with SHA-1 22a794f499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2079463 Change-Id: I9822f863567aad9b292df5fe41b6d177577f13db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14finalize_sdk.py: add --readme option am: 018e0d0f54 am: 45bedb99d5Mårten Kongstad
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2076378 Change-Id: I7ca5f16d3457304cd80c0a0bf0c319ddd86dbdb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge "Generating api diff files for each module sdk." am: 6e31252b35Gurpreet Singh
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120161 Change-Id: I255ebc734dec1b09661ba2c232732fa1b622b0ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge "Generating api diff files for each module sdk." am: 6e31252b35Gurpreet Singh
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120161 Change-Id: Ib7cf60d1ee5c993233a2fc3a36fe297e4cf6d879 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge "Generating api diff files for each module sdk."Gurpreet Singh
2022-06-13Add bluetooth and uwb as optional modules am: 350760127fPaul Duffin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/18839975 Change-Id: Ie022db0ba12bb97069a854e02ea7c884a602ac59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13Add bluetooth and uwb as optional modulesPaul Duffin
Bug: 233965247 Test: packages/modules/common/build/mainline_modules_sdks.sh # Check the output to ensure that uwb/bluetooth uses the # module specific Soong config. # Unpack the bluetooth/uwb snapshots into prebuilts/module_sdk/... m nothing Ignore-AOSP-First: Bluetooth and uwb are not present in AOSP Change-Id: I09c7b2ef95f941e61eba933b4e9b3625c01adfeb
2022-06-11[automerger skipped] Optional modules need a module specific soong config ↵Paul Duffin
variable am: e75e7c57e7 -s ours am skip reason: Merged-In I6a85b6f9877fc251010ff2bbee75fe8fa99db9b4 with SHA-1 d20edd6c69 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/18819312 Change-Id: Ib596c584afc8107b822d340db19d07b0d98bc09b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Generating api diff files for each module sdk.Gurpreet Singh
In order to detect the addition of any new APIs in any mainline module, an API diff file (current module sdk vs the last finalized module sdk) needs to be generated correpsonding to each module sdk. This CL generates the API diff files corresponding to each module sdk and copy that to the out/dist directory. This CL also contains the tests to verify the generation of api diff files. Bug: 230609867 Test: builds successfully. Generates API diff files for each module sdk "atest mainline_modules_sdks_test" passes. Change-Id: I1d8276a4054b92490ccca3dae36c48c639925f46
2022-06-09Optional modules need a module specific soong config variable am: d20edd6c69Paul Duffin
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120157 Change-Id: Ie5ab8e4c0775838805a0115a495df8c6664bcc5e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Optional modules need a module specific soong config variable am: d20edd6c69Paul Duffin
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120157 Change-Id: I6b2b6fb406c25471238b61b95963424cc560a294 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Optional modules need a module specific soong config variablePaul Duffin
Optional modules, i.e. those modules which may be provided by Google or vendors depending on the vendor, need to have its own Soong config variable that controls whether prebuilts are used or not. Without that the build will always attempt to use the Google prebuilt module instead of the vendor provided module. This change: 1. Adds support for specifying which modules are optional and will generate a module specific soong_config_module_type that uses a module specific Soong config variable. 2. Generates the soong_config_module_type for optional modules inline in the snapshot Android.bp file (instead of importing from a manually curated definitions files). That simplifies the cost of adding optional modules. 3. Adds some extra tests to ensure that S and Tiramisu behave the same way. Bug: 233965247 Test: atest mainline_modules_sdks_test packages/modules/common/build/mainline_modules_sdks.sh # Check the output to ensure that wifi uses the wifi specific # Soong config but ipsec (as a non-optional module) does not. # Unpack the wifi snapshot into prebuilts/module_sdk/Wifi Change-Id: I6a85b6f9877fc251010ff2bbee75fe8fa99db9b4 (cherry picked from commit d20edd6c69cf07dc357d674463233c95aaa664ac) Merged-In: I6a85b6f9877fc251010ff2bbee75fe8fa99db9b4
2022-06-09Revert "Generate soong_config_module_type inline in the snapshot" am: e363782a5cPaul Duffin
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120162 Change-Id: I0d57fd3226447115e35560c31c360f8628d6999f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Revert "Generate soong_config_module_type inline in the snapshot" am: e363782a5cPaul Duffin
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120162 Change-Id: I209bd0a11e331c60c64d9b6fad87937c9347af10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Optional modules need a module specific soong config variablePaul Duffin
Optional modules, i.e. those modules which may be provided by Google or vendors depending on the vendor, need to have its own Soong config variable that controls whether prebuilts are used or not. Without that the build will always attempt to use the Google prebuilt module instead of the vendor provided module. This change: 1. Adds support for specifying which modules are optional and will generate a module specific soong_config_module_type that uses a module specific Soong config variable. 2. Generates the soong_config_module_type for optional modules inline in the snapshot Android.bp file (instead of importing from a manually curated definitions files). That simplifies the cost of adding optional modules. 3. Adds some extra tests to ensure that S and Tiramisu behave the same way. Bug: 233965247 Test: atest mainline_modules_sdks_test packages/modules/common/build/mainline_modules_sdks.sh # Check the output to ensure that wifi uses the wifi specific # Soong config but ipsec (as a non-optional module) does not. # Unpack the wifi snapshot into prebuilts/module_sdk/Wifi Change-Id: I6a85b6f9877fc251010ff2bbee75fe8fa99db9b4
2022-06-09Revert "Generate soong_config_module_type inline in the snapshot"Paul Duffin
This reverts commit d29f8e059712d28346eb2b92ef7b5780695ed3ad. Although I tested this well using unit tests they don't test everything and although I tested the unpacking of some snapshots I did not test what happens when all the ART sdk/module_exports snapshots are unpacked. I just did and the build broke. The build broke because while the soong_config_module_type modules are marked as being Nameless (and so according to the documentation do not have to have unique names) it turns out that is not true. There is at least one place in the build where the names of Nameless modules are checked and as a result this breaks. I could fix the build breakage reasonably easily but the problem is that I would have to apply that fix on all partners otherwise they wouldn't be able to receive the next set of snapshots which is too high a cost. So, I am reverting this and will limit the use of inline soong_config_module_type modules to optional modules. Reason for revert: Breaks the build when snapshots are unpacked. Bug: 233965247 Change-Id: I1faae863c48f1fbfd49d2545f242401bdd4f8f8a
2022-06-09Generate soong_config_module_type inline in the snapshot am: d29f8e0597Paul Duffin
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120156 Change-Id: Ie1494b49e9601e7c6b113556c93d343e4d4a3a8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Generate soong_config_module_type inline in the snapshot am: d29f8e0597Paul Duffin
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120156 Change-Id: I8265356d7190940055ff4193e8b5780501f40d7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Generate soong_config_module_type inline in the snapshotPaul Duffin
Previously, this imported the soong_config_module_type definitions from a manually curated file. That had a couple of problems: 1. It required that the file be manually updated everytime that a new module_type was added to an sdk snapshot controlled by a specific config variable. 2. Adding a new config variable required creating another file to be manually curated. 3. It made a snapshot that was generated for an earlier release dependent on an additional file from that release which was in a separate repository and would require a lot of extra work to update if necessary. This change generates the soong_config_module_type inline in the snapshot Android.bp file and while it makes it slightly bigger and does duplicate some of these definitions in snapshots that use the same config variable it makes each snapshot much more self contained and makes it easier to add module specific config variables. The latter is the main driver for this change as follow up changes will add module specific variables for the optional modules. Bug: 233965247 Test: atest mainline_modules_sdks_test packages/modules/common/build/mainline_modules_sdks.sh # Compare before and after to make sure that they are # consistent. Change-Id: Ie6b6d99e1fcb17ebd8ed291a5bc7d4664fceea92
2022-06-09Merge "Remove NetworkPermissionConfig package" am: 2ec8e5cd49Motomu Utsumi
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2111384 Change-Id: If33f53c7977c6570f1d9809af4f2d1f27cbc4984 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09[automerger skipped] Merge "Remove NetworkPermissionConfig package" am: ↵Motomu Utsumi
2ec8e5cd49 -s ours am skip reason: Merged-In I9d2ad14b594402492eb8f4a8df34fa616a542a0a with SHA-1 9ea376ddb2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2111384 Change-Id: Ibb9be0184ed6c30f58abfdac33c53ed68bab4d13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09[automerger skipped] Remove NetworkPermissionConfig package am: bed435be74 ↵Motomu Utsumi
-s ours am skip reason: Merged-In I9d2ad14b594402492eb8f4a8df34fa616a542a0a with SHA-1 9ea376ddb2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2111384 Change-Id: Id8adb3332fa1f6bac5fed45261924cd336c2bab0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge "Remove NetworkPermissionConfig package"Motomu Utsumi
2022-06-08Add min sdk version for libprotobuf-cpp-lite-ndkAkshay Miterani
Generated using go/apex-allowed-deps-error Command used: `croot && packages/modules/common/build/update-apex-allowed-deps.sh` * Similar to http://ag/18568342 * Related discussion: http://g/mainline-modularization/wf06eSLVB1s Bug: 217756405 Test: make Apex-Size-Increase: http://g/mainline-modularization/wf06eSLVB1s Previous-Platform-Support: None Aosp-First: No Test-Info: atest OnDeviceClassifierTest Ignore-AOSP-First: Initial release to internal project. Change-Id: Id356c1711ed7c24758c83b70854d9b5221797a8e
2022-06-08Fix build_release comparison condition. am: 2c7c723d38Gurpreet Singh
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120152 Change-Id: Idbd94e5f7eafa39c5479581b76981682d6553e55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08Fix build_release comparison condition. am: 2c7c723d38Gurpreet Singh
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2120152 Change-Id: Id68b4fa14c1bef941f9687c5ef614667b4374929 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 03:54:30 +0000