aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-14.0.0_r50' of ↵George Zacharia2024-06-3054-1112/+3942
|\ | | | | | | | | | | https://android.googlesource.com/platform/build/soong into u14.0 Android 14.0.0 Release 50 (AP2A.240605.024)
| * Merge "Add secretkeeper-v1-java to platform APIs" into main am: f28b5697b8 ↵Nikolay Elenkov2024-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | am: 196729ffda Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3003166 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c8170926f66853d4ff38e48c7af4ab9fdf0ae5ae) Merged-In: I6ed203fab98537ae18c51c9def19434acdbf20db Change-Id: I6ed203fab98537ae18c51c9def19434acdbf20db
| * Create rule to generate the exportable api files when checkapi is disabledJihoon Kang2024-03-201-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITHOUT_CHECK_API environment variable enables the checkapi to be removed from the critical path. The variable is rarely used within AOSP, but the downstream vendors may depend on it, in order to improve the build performance given that the api signature file through metalava is a resource costly task. Currently, the exportable api files / removed api files are not generated when checkapi is disabled, but a module may depend on the exportable api files when a checkapi is disabled. In order to prevent the missing build rules error in this case, generate the rule to copy the checked in api file / removed api file to the exportable api file / removed api file to prevent build errors. This change also fixes the error message when the OutputFiles(string) api file is null, to correctly inform the user the error. Test: m BUILD_FROM_SOURCE_STUB=true WITHOUT_CHECK_API=true && inspect ninja path and verify that "non-updatable-exportable-current.txt" depends on the generated exportable api file. Bug: 329374072 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2d4074a022c0d836c712a6606b5c6e2cb376e07a) Merged-In: I24f88d450fb46b6ea9d5920d83617d8228edd34b Change-Id: I24f88d450fb46b6ea9d5920d83617d8228edd34b
| * Revert "Additional cleanup prior to adding the runtime stubs"Jihoon Kang2024-03-201-53/+45
| | | | | | | | | | | | | | | | | | | | | | Revert submission 2929615 Reason for revert: b/328225000 Reverted changes: /q/submissionid:2929615 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de57c7a324b405fbbfe887b2512afa1845083f2d) Merged-In: I29c605adb9401c9cb8b58646f2ae7b53b9a758e9 Change-Id: I29c605adb9401c9cb8b58646f2ae7b53b9a758e9
| * Revert "Generate runtime stubs in droidstubs"Jihoon Kang2024-03-203-85/+9
| | | | | | | | | | | | | | | | | | | | | | Revert submission 2929615 Reason for revert: b/328225000 Reverted changes: /q/submissionid:2929615 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:17f01d976acd757cb6afabba3f3606a6b25d0ecf) Merged-In: Ifbec11417103c96b37a4da18dfc9fda73f654d8f Change-Id: Ifbec11417103c96b37a4da18dfc9fda73f654d8f
| * Merge changes I177441bc,I32daefbd into main am: 1c96fab7d0 am: 5d7d4ba90bSpandan Das2024-03-042-3/+35
| |\ | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984038 Change-Id: Ic323eae00fc8c07b42490af6d4caa5298d3e8b0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Merge changes I177441bc,I32daefbd into main am: 1c96fab7d0Spandan Das2024-03-042-3/+35
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984038 Change-Id: I567f1873fefdb987776f544e755220cdbea5a97f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * Merge changes I177441bc,I32daefbd into mainSpandan Das2024-03-042-3/+35
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Use BaseModuleName for LOCAL_MODULE Disable source javalib dexpreopt when using prebuilt apex
| | | | * Use BaseModuleName for LOCAL_MODULESpandan Das2024-03-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL uses OverrideName to ensure that the LOCAL_MODULE does not contain any version information. Test: Created CaptiveLoginPortalGoogle.v2, and checked that its LOCAL_MODULE is CaptiveLoginPortalGoogle Change-Id: I177441bcd55ca538759b69aafb73d0a8b7261179
| | | | * Disable source javalib dexpreopt when using prebuilt apexSpandan Das2024-03-041-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The apex_contributions in next builds use prebuilt apexes with source java_sdk_library for javac. The dexpreopt rules of the source java_sdk_library are disabled via RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE coupled with some complicated special-casing in android/prebuilt.go This special-casing breaks if we want to use prebuilts of some modules, and sources of other modules. To enable per mainline module toggelability, explicitly disable dexpreopt of source variant of java_sdk_library if we use prebuilt of the containing apex. Test: In internal, updated trunk_staging.scl's RELEASE_APEX_CONTRIBUTIONS_ADSERVICES to use prebuilt followed by m nothing Change-Id: I32daefbd38338b396d6f07b899826b2869d8f8e1
| * | | | Merge "Use R.txt files from aar files directly" into main am: 4b6a3ae65c am: ↵Colin Cross2024-02-291-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2820e81aa Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2980833 Change-Id: Ica62f75a236a2e8a2cb3039ecdcae73851de1f07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | 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
| * | | | 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 "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>
| | | * | | 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
| * | | | | 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
| * | | | | Merge "Add property Skip_jarjar_repackage" into mainZi Wang2024-02-271-5/+10
| |\ \ \ \ \
| | * | | | | Add property Skip_jarjar_repackageZi Wang2024-02-271-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this property is set to true on a module, this module will not have jarjar repackaging. Test: CI Bug: 327009143 Change-Id: I9384c9c25ce581ac00d309a188cf7533eb2e44a6 Ignore-AOSP-First: Will cp to aosp
| * | | | | | Merge "Support new property "arch_dpi" for android_import" into main am: ↵Treehugger Robot2024-02-272-8/+100
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8bf3013844 am: a948adc496 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967069 Change-Id: Ib498f26d7c63d9ec3ab209bad7dac75c61afb2f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | Merge "Support new property "arch_dpi" for android_import" into main am: ↵Treehugger Robot2024-02-272-8/+100
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8bf3013844 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967069 Change-Id: I0eb96ab1d45a47c4a67d4fef7f79d813846a6441 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | Merge "Support new property "arch_dpi" for android_import" into mainTreehugger Robot2024-02-272-8/+100
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Support new property "arch_dpi" for android_importHerbert Xue2024-02-262-8/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support the feature with new property combined with architecture and dpi resolution. Bug: 319381869 Test: go test -run TestAndroidAppImport_ArchVariants Change-Id: Ib43cbae8868fc35701e6666867b2325f5abbb2c7
| * | | | | Convert the build flag RELEASE_EXPORT_RUNTIME_APIS to a product variable am: ↵Jihoon Kang2024-02-231-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35349466cd am: d881124481 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973435 Change-Id: Ibd79e6f44a9f776293db83efac8636c32a2acf85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | Convert the build flag RELEASE_EXPORT_RUNTIME_APIS to a product variable am: ↵Jihoon Kang2024-02-231-1/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35349466cd Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973435 Change-Id: If699df9c820f06564446c5fac15ad79e2bb9365f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | Convert the build flag RELEASE_EXPORT_RUNTIME_APIS to a product variableJihoon Kang2024-02-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RELEASE_EXPORT_RUNTIME_APIS build flag is currently used to modify the filter condition for the "exportable" stubs, so that it exposes wider set of flagged apis (ENABLED && READ_ONLY vs ENABLED || READ_WRITE). This flag was originally introduced as a build flag to be enabled in specific release configurations, but instead this is used as a product variable that will be enabled in the product `sdk_with_runtime_apis`, which will be introduced in a future change. Test: m nothing --no-skip-soong-tests Bug: 326312949 Change-Id: Ieb3cee517dd6cedcca844a9eab270aedf8199d4e
| * | | | | Merge "Modify sdk_library to dist exportable api files by default" into main ↵Jihoon Kang2024-02-211-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5135a0df57 am: c09ef10f8d Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2970651 Change-Id: I8f4f37a00d0be29616201c212f1e62b721a06bcf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | Merge "Modify sdk_library to dist exportable api files by default" into main ↵Jihoon Kang2024-02-211-2/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5135a0df57 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2970651 Change-Id: I75c03735713efc3d920cacc04bae33229138ac0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | Merge "Modify sdk_library to dist exportable api files by default" into mainJihoon Kang2024-02-211-2/+4
| | | |\ \ \
| | | | * | | Modify sdk_library to dist exportable api files by defaultJihoon Kang2024-02-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the "exportable" stubs are copied to the dist directory by default when building the java_sdk_library module. However, "everything" api files (current & removed) are copied to the dist directory, causing confusion to the developers. This change modifies the default behavior so that the "exportable" api files are copied to the dist directory and match the behavior of the stubs. Test: m nothing Bug: 325639165 Change-Id: I2e3b158bb638d30629120b32aa3e88bb26231020
| * | | | | | Merge "AOSP platform_apis violations" into main am: dcda79b5e7 am: 7fd2b6f964Treehugger Robot2024-02-201-1/+171
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969671 Change-Id: I7c40ea056e1651cb9d8c1e05521989585f744ee4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | Merge "AOSP platform_apis violations" into main am: dcda79b5e7Treehugger Robot2024-02-201-1/+171
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969671 Change-Id: I8e411a5390f9af312a4dd2f54abb04f41e5b5884 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | AOSP platform_apis violationsSpandan Das2024-02-201-1/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allowlist contains java_library modules which set the no-op property `platform_apis`. This allowlist will help enforce that there are no new violations. This should be a no-op till https://android-review.git.corp.google.com/c/platform/build/soong/+/2969451 is submitted Test: presubmits Bug: 215379393 Change-Id: I49372e1d476201f607cd717be26aa3909668ff26