aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | Merge "Use R.txt files from aar files directly" into main am: 4b6a3ae65cColin Cross2024-02-291-4/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2980833 Change-Id: I2f91f88d0d347e598ddda2dbbeb67b4fc9d19da6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | Merge "Use R.txt files from aar files directly" into mainColin Cross2024-02-291-4/+4
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Use R.txt files from aar files directlyColin Cross2024-02-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the R.txt files from aar imports directly instead of recreating one using aapt2 from the embedded resources. Fixes an issue with com.google.android.material where the jar was referencing com.google.android.material.R.attr.theme, aapt2 was not producing "int attr theme 0x0" in R.txt, but the aar's R.txt had it. Bug: 294256649 Test: builds Change-Id: Ibe1e5535a75eed59f3b8dbbc12eff9c07af51d37
| | * | | | | | | | | | Merge changes I8d060594,I2b6a57ae into main am: 5d55b66861 am: 8b64ad9506Colin Cross2024-02-293-14/+57
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2980832 Change-Id: I3aa663741d26491ffeb10cc2fb2c97a3a83c46be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | | Merge changes I8d060594,I2b6a57ae into main am: 5d55b66861Colin Cross2024-02-293-14/+57
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2980832 Change-Id: If904b08b58a76b4d82ca3926e4d23d89ffcc588f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | | Merge changes I8d060594,I2b6a57ae into mainColin Cross2024-02-293-14/+57
| | | | |\| | | | | | | | | | | | |_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Put extraCombinedJars after the compiled jars Use RSP file for long classpaths
| | | | | * | | | | | Put extraCombinedJars after the compiled jarsColin Cross2024-02-282-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extraCombinedJars contains the R.jar generated by ResourceProcessorBusyBox for apps. It needs to go before any static_libs dependencies so that the finalized R values take precedence over any non-final R values that may have been included in the dependencies. Moving after the javac and kotlinc compiled jars helps minimize differences when turning on use_resource_processor by default by using the MANIFEST.MF generated by soong_zip instead of the one generated by ResourceProcessorBusyBox, which contains a different Created-By field. Bug: 294256649 Test: m javac-check Change-Id: I8d060594404121fd36ef650ac317f0c5d5f92b23
| | | | | * | | | | | Use RSP file for long classpathsColin Cross2024-02-281-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting use_resource_processor: true can increase the length of the classpath enough to trigger "command line too long" errors. There are clockwork libraries with 546 transitive android_library dependencies. Write classpaths longer than 64kB to a separate file and add them to the javac and turbine command lines with the @file syntax. Bug: 294256649 Test: m checkbuild Change-Id: I2b6a57ae30de03347db3221e9c9a4b2efb490115
| | * | | | | | | | | Merge "Some tweaks to the aconfig flag collection logic" into main am: ↵Yu Liu2024-02-293-16/+29
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c2cd90232 am: 4782aa50bf Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2983533 Change-Id: I91948e96a5df217441135f631040e80a060197d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | Merge "Some tweaks to the aconfig flag collection logic" into main am: ↵Yu Liu2024-02-293-16/+29
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c2cd90232 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2983533 Change-Id: I3bc2f231c2b13fa716d01c7bbbabd96fb280ebc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | Merge "Some tweaks to the aconfig flag collection logic" into mainYu Liu2024-02-293-16/+29
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | | | * | | | | | Some tweaks to the aconfig flag collection logicYu Liu2024-02-283-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Output the aconfig flags pb and storage files to /etc 2. Fix a bug where aconfig flags were not collected for java_sdk_library Bug: None Test: manual and unit tests. Change-Id: I0896e91918c1b53c98ac9dc0f4a636f158200891
| | * | | | | | | | | Merge "Revert "Fix non-determinism in prebuilt selection"" into main am: ↵Spandan Das2024-02-293-120/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5354483c12 am: 1e9810748e Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984372 Change-Id: Ied7c0c39b23d6187523b31a92c0851c43349149a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | Merge "Revert "Fix non-determinism in prebuilt selection"" into main am: ↵Spandan Das2024-02-293-120/+3
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5354483c12 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984372 Change-Id: I5c759faa655a3fa81f68ffbdb42dfb70ea4d22e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | Merge "Revert "Fix non-determinism in prebuilt selection"" into mainSpandan Das2024-02-293-120/+3
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | | * | | | | | Revert "Fix non-determinism in prebuilt selection"Spandan Das2024-02-293-120/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2d8884a37757edc6b984e1e073ab5a9e4a85f778. Reason for revert: Build breakage https://groups.google.com/a/google.com/g/android-build-police-core/c/00mM-B9unVg/m/0FxBxpMbAwAJ. The validation does not check for namespace isolation which breaks libtonemap Change-Id: Ieb4d3bc4f3ade856877ebb62a567620f5a1ed08c
| | * | | | | | | | | Add a source_module_name to android_app am: efa146577f am: 85437f2901Spandan Das2024-02-291-0/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2982635 Change-Id: I208e1e0dac79ee1e865785a5374a958c487914bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | Add a source_module_name to android_app am: efa146577fSpandan Das2024-02-291-0/+9
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2982635 Change-Id: I86d01156c103b3fc08f105d2890c9882f5fdeb57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | Add a source_module_name to android_appSpandan Das2024-02-291-0/+9
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For multiple mainline prebuilts, we will have multiple versioned prebuilt apps in the tree. The soong name of these prebuilts will have a version prefix to prevent name collisions (e.g. MyGoogleApp.v2). This CL introduces a source_module_name property in android_app_imoprt. This property will be used for the following 1. Determining installation path. This should be /system/app/MyGoogleApp/MyGoogleApp.apk and not /system/app/MyGoogleApp.v2/MyGoogleApp.apk (filename prop determines the filename and not the dir name) 2. Preventing duplicate installation rules: This property will be used to create a dependency to the source app, and call HideFromMake on all the unflagged apps Test: presubmits Test: locally # Created CaptivePortalLoginGoogle.v2 and selected it using one of the RELEASE_APEX_CONTRIBUTION_* flags Bug: 326995930 Change-Id: If4ab9f9bd295117c96eb062cf3b3d2efc8bfed12
| | * | | | | | | | Merge "Let Release_aidl_use_unfrozen add vintf_fragments" into mainDevin Moore2024-02-291-2/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Let Release_aidl_use_unfrozen add vintf_fragmentsDevin Moore2024-02-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The product_config variable can be used to add different vintf_fragments. Ignore-AOSP-First: this is required for vFRC finalization and needs to be submitted ASAP. This can be cherry-picked to aosp after finalization. Test: launch_cvd && atest hal_implementation_test Test: lunch `next` && atest vts_treble_vintf_framework_test Bug: 279809333 Change-Id: Ied17ad4c4564a5d97f93001734fba7cc6648bbc2
| | * | | | | | | | | Fix non-determinism in prebuilt selection am: 2d8884a377 am: abd735bb6cSpandan Das2024-02-293-3/+120
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2978137 Change-Id: I460c2a2fbc0b083f95117265eb1addde08d67c8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | Fix non-determinism in prebuilt selection am: 2d8884a377Spandan Das2024-02-293-3/+120
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2978137 Change-Id: I4a4d775e19657dbd33ddd2017c40c8651315db3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | Fix non-determinism in prebuilt selectionSpandan Das2024-02-293-3/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple versions of the prebuilt module sdk share the same soong config namespace, then PrebuiltPostDepsMutator rewrites rdeps to one of those prebuilts in a non-deterministic way. This CL uses apex_contributions to make this deterministic. Multiple prebuilts will not be allowed to have their prefer evaluate to true. If this happens, one of the prebuilts must be explicitly declared in apex_contributions. This CL also fixes the special-casing of the top-level java_sdk_library_import in ReplaceDirectDependencies. For framework-foo.v2, it will use BaseModuleName framework-foo instead of SdkLibraryName framework-foo.v2 to determine if the source module has been selected. Test: Added a unit test Test: aninja -t query out/soong/.intermediates/packages/modules/Permission/SafetyCenter/Config/safety-center-config/android_common/javac/safety-center-config.jar | grep module_sdk is empty (should not cause a regression for 323454855) Bug: TODO Change-Id: I7191200c330c5bcb9d5532006d3c573a60db61cc
| | * | | | | | | | | Merge "Sort jarjar rename keys before using" into main am: 688f824e1a am: ↵Inseob Kim2024-02-291-2/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 224ac62ba8 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2981731 Change-Id: I6e5a5fa9b8cd1bb49a0d90b9996838b4cf3669aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | Merge "Sort jarjar rename keys before using" into main am: 688f824e1aInseob Kim2024-02-291-2/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2981731 Change-Id: I18ade8539893ac793663217f47c786e76f5a2aff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | Merge "Sort jarjar rename keys before using" into mainInseob Kim2024-02-291-2/+4
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Sort jarjar rename keys before usingInseob Kim2024-02-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it deterministic Bug: 327302642 Test: compare build commands among different targets Change-Id: I890dcd67c62db58938a6e6d1c4e3fbd323c72b18
| | * | | | | | | | | | Merge "Enable non-"everything" stubs generation in java_api_library" into ↵Jihoon Kang2024-02-287-6/+148
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main am: 641bd9daee am: 04338c8ae2 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2977092 Change-Id: I8297262de0e3260b8af19e683e1b46876de71a59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | | Merge "Enable non-"everything" stubs generation in java_api_library" into ↵Jihoon Kang2024-02-287-6/+148
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main am: 641bd9daee Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2977092 Change-Id: I91772243047e96a6144134694f2038878ed7b0ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | | Merge "Enable non-"everything" stubs generation in java_api_library" into mainJihoon Kang2024-02-287-6/+148
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Enable non-"everything" stubs generation in java_api_libraryJihoon Kang2024-02-287-6/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support to generate non-"everything" (i.e. "runtime" and "exportable") stubs in java_api_library, which generates the stubs from the api signature files. Unlike droidstubs module that generates "everything", "exportable" and "runtime" stubs in a single module, java_api_library generates a single set of stubs per module, which is set by the default-"everything" property `stubs_type`. This is because java_api_library is responsible for both generation and the compilation of the stubs srcjar, and compilation of the stubs srcjar are done in separate java_library modules for from-source stubs. Utilization of this feature will be done in a follow up change that generates the "exportable" java_api_library modules in java_sdk_library. Test: m nothing --no-skip-soong-tests Bug: 318009570 Change-Id: I1051544ac3bcdb3ba1f78bfec28eba4e9fad9c2d
| * | | | | | | | | | | | Snap for 11510485 from c4538a09ef9758488ea3f0e1bf9200b436ccc74e to 24Q2-releaseAndroid Build Coastguard Worker2024-02-298-65/+151
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4edc66a670cebfee7468d30a500d24dc5fea2605
| | * | | | | | | | | | | Merge "Update unaligned-vector-mem to -munaligned-access" into main am: ↵Aditya Kumar2024-02-281-6/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 592b54c443 am: b54effc612 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2977952 Change-Id: Icd6b27f8139e010bb35278fdf4ebf8fad18bac04 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | | | Merge "Update unaligned-vector-mem to -munaligned-access" into main am: ↵Aditya Kumar2024-02-281-6/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 592b54c443 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2977952 Change-Id: I5001c1465f48c0a9647026864fff6b655d717077 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | | | Merge "Update unaligned-vector-mem to -munaligned-access" into mainAditya Kumar2024-02-281-6/+2
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Update unaligned-vector-mem to -munaligned-accessAdityaK2024-02-281-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest compiler has merged both unaligned access flags into one. TODO: This is needed until we change clang driver to enable -munaligned access by default.for Android b/327307773 Bug: 326790418 Change-Id: Ia8c29dc56104d2cffb8ac41aae6eeacccae68e61
| | * | | | | | | | | | | Merge "Use BaseModuleName of dep when writing to make" into main am: ↵Spandan Das2024-02-282-3/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4dc449593a am: be455487bf Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2978136 Change-Id: I691e0b4fbfa7a104bced1d7b6fafc93b5dff9dbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | | | Merge "Use BaseModuleName of dep when writing to make" into main am: 4dc449593aSpandan Das2024-02-282-3/+6
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2978136 Change-Id: I089b921d4c953aca8dce8dc72882da1d0778b98a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | | | Merge "Use BaseModuleName of dep when writing to make" into mainSpandan Das2024-02-282-3/+6
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Use BaseModuleName of dep when writing to makeSpandan Das2024-02-282-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since BaseModuleName of the dep becomes its LOCAL_MODULE name in the generated mk file, we should also use BaseModuleName of dep for populating properties such as LOCAL_SHARED_LIBS of rdeps Test: m nothing --no-skip-soong-tests Bug: 322175508 Change-Id: I6b47112faa63f85d19b5b71e0e102cea0ab68e3b
| | * | | | | | | | | | | Merge "Add sh_binary dependencies to primary abi of the target" into main ↵Riya Thakur2024-02-282-4/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 88c21f567f am: 54905d0584 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2977494 Change-Id: Id1e9d3f6173cc58909fa210138c01483e19ef83a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | | | Merge "Add sh_binary dependencies to primary abi of the target" into main ↵Riya Thakur2024-02-282-4/+7
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 88c21f567f Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2977494 Change-Id: I4f00c169027dd886030404ab7ce00b826e204b72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | | | Merge "Add sh_binary dependencies to primary abi of the target" into mainRiya Thakur2024-02-282-4/+7
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Add sh_binary dependencies to primary abi of the targetRiya Thakur2024-02-272-4/+7
| | | | | | |_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If compile_multilib is set to 'both' for an apex having a sh_binary dependency for which compile_multilib is not set, then the sh_binary dependency should be added for the primary ABI of the target Bug: 325628733,326985291 Test: m Change-Id: Ie9cd12d49f6854c33af3724cb8e2fc3d8b7627a0
| | * | | | | | | | | | Merge changes I14928b7b,Ia009df3d into main am: 60bdd05b21 am: 58551161caJihoon Kang2024-02-283-52/+136
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2929615 Change-Id: I08398780e76df2a9f67a90da15c12ae9f793589c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | | Merge changes I14928b7b,Ia009df3d into main am: 60bdd05b21Jihoon Kang2024-02-283-52/+136
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2929615 Change-Id: I6c50871814d4165f6b546edae39ca8b16ebba9fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | | Merge changes I14928b7b,Ia009df3d into mainJihoon Kang2024-02-283-52/+136
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Generate runtime stubs in droidstubs Additional cleanup prior to adding the runtime stubs
| | | | | * | | | | | | Generate runtime stubs in droidstubsJihoon Kang2024-02-273-9/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to how the exportable stubs are generated in droidstubs, this change adds the rule to generate the runtime stubs in droidstubs. Unlike the exportable stubs, which the artifacts are dist'ed during the sdk build, the runtime stubs will only used in the hiddenapi flags generation. Therefore, only the stubs are generated and no other artifacts are generated during the "runtime" metalava invocation. When `aconfig_declarations` property is not defined (i.e. no flags are enabled, thus the exportable and the runtime stubs are identical), the runtime stubs are simple copied from the exportable stubs. Note that the runtime stubs are not a dependency of `droid` as of now. The dependency of the hiddenapi flags will be replaced to the runtime stubs in the child CL. Test: m nothing --no-skip-soong-tests && m api-stubs-docs-non-updatable Bug: 319162970 Change-Id: I14928b7b5619522c4caab1dfc795bc9c7e929639
| | | | | * | | | | | | Additional cleanup prior to adding the runtime stubsJihoon Kang2024-02-271-45/+53
| | | | | | |/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change performs additional cleanups in the build rules of the droidstubs module, specifically optionalizing annotationFlags(...) and apiLevelsAnnotationsFlags(...). This is required as "runtime" stubs would not generate other artifacts than the stubs, and thus `stubsArtifacts` would not be generated for "runtime". Test: m nothing Bug: 319162970 Change-Id: Ia009df3d01f49841d5041fb2dfdfa7ef8671bf18
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-20 00:43:52 +0000