summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
7 hoursMerge "Remove unnecessary 33/module-lib/android.test.* jars" into mainHEADmastermainPaul Duffin
13 hoursMerge "Add android-plus-updatable.jar to module-lib and system-server" into mainTreehugger Robot
23 hoursAdd android-plus-updatable.jar to module-lib and system-serverPaul Duffin
The `android.jar` in `module-lib` and `system-server` directories do not include classes from the updatable modules. Also, while `system-server` is supposed to be an extension of `module-lib` its directories does not include system server APIs for the modules that provide a `module-lib` API. e.g. `framework-permission.jar` exists in `34/module-lib` but not in `34/system-server`. The latter only includes `service-permission.jar`. That makes sense as only `service-*.jar`s can provide a `system-server` API but the updatable modules from `module-lib` are still part of the `system-server` API. The lack of updatable classes in `android.jar` breaks the `api-versions.xml` file generation for those API surfaces as that requires a single jar containing the whole API for each surface or each API version. Unfortunately, it is not possible to modify the `android.jar` files to include the updatable modules as other code depends on it not including updatable modules. e.g. some modules will depend on a specific prebuilt version of the `module-lib/android.jar`, e.g. `sdk_version: "module_34"` and then depend on the source version of an updatable jar, e.g. `framework-connectivity.stubs.module_lib` to get the very latest version. Adding `framework-connectivity` to the `android.jar` (which comes first on the classpath) would prevent the compiler from seeing the latest version causing compilation errors. This change adds a script and uses that script to add new `android-plus-updatable.jar`s to the `module-lib` and `system-server` directories as follows: * The `module-lib/android-plus-updatable.jar` contains the contents of the `module-lib/android.jar` plus the contents of all the updatable module jars (excluding `art.jar` as that is already in `android.jar` otherwise it would not work as `javac` needs to see `java.lang.*` classes). * The `system-server/android-plus-updatable.jar` contains the contents of the `system-server/android.jar` plus the contents of all the updatable module jars from `module-lib` plus the contents of all the `service-*.jar`s from `system-server`. The script was run as follows: ./create-android-plus-updatable-jar.sh 30 31 32 33 34 The output can be found at https://paste.googleplex.com/6222208409534464. Bug: 337836752 Test: TARGETS=$(for i in public system module-lib system-server; do U=$(echo $i | sed "s|-|_|g"); echo "out/target/common/obj/PACKAGING/api_versions_${U}_generated-api-versions.xml"; done) m $TARGETS; mkdir -p before; cp $TARGETS before m $TARGETS; mkdir -p after; cp $TARGETS after meld before after # Review differences. Change-Id: I1eb55a974c555f7c527e461a5a19e1ef318955fa
2 daysMerge "Update AndroidX from build 11784606" into mainAnvesh Renikindi
3 daysUpdate AndroidX from build 11784606Anvesh Renikindi
Arguments: --include androidx.credentials --build 11784606 --upstream aosp/main Test: prebuilts Change-Id: I673af836c256fa86ebfeef995c5c447ecfa161f0 Merged-In: I3815f7c8ae43363e46477267d4094d822b97b2b0
3 daysRemove unnecessary 33/module-lib/android.test.* jarsPaul Duffin
They were added by ag/18083391 to work around some issue with the way that Soong was looking for the module-lib build artifacts but as they do not appear in `prebuilts/sdk/34/module-lib` it is clear that issue has been fixed and so the workaround can be removed. Bug: 225745567 Test: TH Change-Id: I5a0afbd35abd81a6f86afb55aa695b238f0d2df1
5 daysMerge "Revert "Reland: "Add aliases for -nodeps targets""" into mainAlan Viverette
8 daysRevert "Reland: "Add aliases for -nodeps targets""Colin Cross
This reverts commit 7130f6d005a717f86628161c955a5b4922629792. Reason for revert: all usages of the aliases have been removed. Change-Id: I8e075e00f52538e0db66da294d98a33ebf52e509
8 daysMerge "Update AndroidX from existing prebuilts to restore altered manifests" ↵Colin Cross
into main
8 daysUpdate AndroidX from existing prebuilts to restore altered manifestsAlan Viverette
Arguments: --config /google/src/cloud/alanv/alanv_updateprebuilts_kotlin/google3/java/com/google/wireless/android/androidx/updateprebuilts/configs/default.toml --downstream goog/main --upstream aosp/main Test: prebuilts Change-Id: Ia5021b828b78536e26b79105cae8886c08b29dcc Merged-In: Ia5021b828b78536e26b79105cae8886c08b29dcc
11 daysMerge "Reland: "Add aliases for -nodeps targets"" into mainAlan Viverette
11 daysMerge "Update AndroidX from existing prebuilts" into mainAlan Viverette
11 daysReland: "Add aliases for -nodeps targets"Alan Viverette
This relands Ib48f023fd8bb7547830b3973fcb310eae43244bd. Bug: 331409973 Merged-In: Iff98a40a8acb0c2c3c395e03f69cac82dd04e1c6 Change-Id: Iff98a40a8acb0c2c3c395e03f69cac82dd04e1c6
11 daysUpdate AndroidX from existing prebuiltsAlan Viverette
Arguments: --config /google/src/cloud/alanv/alanv_updateprebuilts_kotlin/google3/java/com/google/wireless/android/androidx/updateprebuilts/configs/default.toml --downstream goog/main --upstream aosp/main Test: prebuilts Change-Id: I6c73f6d252f239046f604d33c8b102901f5aa83e Merged-In: I6c73f6d252f239046f604d33c8b102901f5aa83e
11 daysMerge "Remove deprecate jack-jacoco-reporter" into mainJim Tang
2024-04-19Remove deprecate jack-jacoco-reporterJim Tang
Jack toolchain had been deprecated for years, this commit is to clean it up. Bug: 122333025 Bug: 332464939 Test: m Change-Id: I2847f3d9cbf3d39bbad98846b406f16d03efc9c9
2024-04-19Merge "Remove modules related to USE_PREBUILT_SDK_TOOLS_IN_PLACE" into mainJim Tang
2024-04-18Merge "Update AndroidX from build 11703278" into mainVineel Sadineni
2024-04-18Remove modules related to USE_PREBUILT_SDK_TOOLS_IN_PLACEJim Tang
USE_PREBUILT_SDK_TOOLS_IN_PLACE is not false anywhere else, modules which take effects when USE_PREBUILT_SDK_TOOLS_IN_PLACE==false can be removed. Bug: 122333025 Bug: 332464939 Test: m Change-Id: I2327eff84757001931d6ea313cbc5b2d1768d3be
2024-04-17Update AndroidX from build 11703278Vineel Sadineni
Arguments: --include androidx.navigation --build 11703278 --upstream aosp/main Test: prebuilts Change-Id: Idc7193025fc1dbff18bbe2e51f35b5275aabd168 Merged-In: I9aa18867c0e107713aeb310f08e1dfcc30c20213 Bug: 322508920, 328943579
2024-04-17Merge "Revert "Update AndroidX from existing prebuilts"" into mainAlan Viverette
2024-04-17Merge "Revert "Add aliases for -nodeps targets"" into mainAlan Viverette
2024-04-17Revert "Update AndroidX from existing prebuilts"Alan Viverette
Revert submission 3023343-nodeps Reason for revert: b/335445789 Reverted changes: /q/submissionid:3023343-nodeps Merged-In: I3dd1ff3915c8ec0b9154825dc26b82cac587ff97 Change-Id: I36cbaf5504fe46a3454b45a3dde2e9733b310d91
2024-04-17Revert "Add aliases for -nodeps targets"Alan Viverette
Revert submission 3023343-nodeps Reason for revert: b/335445789 Reverted changes: /q/submissionid:3023343-nodeps Merged-In: Ia903920e5f2345e9640e56be832c64ea35eb9c11 Change-Id: Ie5a37527fff8282730fff7dee9e438e37fd6ccac
2024-04-16Merge "Add aliases for -nodeps targets" into mainTreehugger Robot
2024-04-16Merge "Update AndroidX from existing prebuilts" into mainTreehugger Robot
2024-04-16Add aliases for -nodeps targetsAlan Viverette
Fixes: 331409973 Merged-In: Ib48f023fd8bb7547830b3973fcb310eae43244bd Change-Id: Ib48f023fd8bb7547830b3973fcb310eae43244bd
2024-04-15Update AndroidX from existing prebuiltsAlan Viverette
Arguments: --config /google/src/cloud/alanv/CS-default-2024-03-07_150748/google3/java/com/google/wireless/android/androidx/updateprebuilts/configs/default.toml --upstream aosp/main --downstream goog/main --change I3f1ab792900aa3bbafccba86bb366a125500ec78 Test: prebuilts Change-Id: I3f1ab792900aa3bbafccba86bb366a125500ec78 Merged-In: I3f1ab792900aa3bbafccba86bb366a125500ec78
2024-04-11Merge "Update android-incompatible.txt with latest API update" into mainTreehugger Robot
2024-04-10Update android-incompatible.txt with latest API updatephirasit
There is a recent Connectivity API update aosp/2953588 which impacts the Connectivity SDK prebuilt drop on udc-thgtv-dev. Technically, this API change isn't incompatible. However, the metalava tool doesn't support this kind of change until aosp/2692268 which is not present on this branch. The effort to backport the metalava change is too much compared to just waive this issue from the baseline file. Bug: 325859633 Test: m checkapi with the latest Tethering drop ab/11481658 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:130d27588504b1224bd08f7be89ca3ff9e512bfb) Merged-In: Iaac6e2752b0324dd0a3430b9159ad2e6b3524eff Merged-In: Ic486d2df3d750e183285682f2cbe57f9e80da7b5 Change-Id: Iaac6e2752b0324dd0a3430b9159ad2e6b3524eff
2024-04-10Merge "Update AndroidX from build 11689954" into mainAnvesh Renikindi
2024-04-10Merge "Update AndroidX from build 11689954" into mainAnvesh Renikindi
2024-04-09Update AndroidX from build 11689954Anvesh Renikindi
Arguments: --include androidx.camera --build 11689954 --upstream aosp/main Test: prebuilts Change-Id: I3450526c8fbdde01630adc294bc4e4bd3b84c822 Merged-In: Ib0f6700394167abcc89544ed82edfd9bbfe6502f
2024-04-09Update AndroidX from build 11689954Anvesh Renikindi
Arguments: --include androidx.browser --build 11689954 --upstream aosp/main Test: prebuilts Change-Id: I08a944f91b788e3c8c06161f84d2919c001eae86 Merged-In: Ie6f82d10aee60295aa918455a4dd537228a00690
2024-04-09Merge "Update AndroidX from build 11671820" into mainVineel Sadineni
2024-04-09Merge "Update AndroidX from build 11683807" into mainAnvesh Renikindi
2024-04-09Update AndroidX from build 11671820Vineel Sadineni
Arguments: --include androidx.activity --build 11671820 --upstream aosp/main Test: prebuilts Change-Id: Ia8c2c2d7a2c723103bb2ff8ea9735c698b8c6f0f Merged-In: Ic0d9861e1c50fa96497cccac8dfa727654a96c64 Bug: 322508920
2024-04-08Merge "Update sdk_version to 34 for all Jetpack libraries" into mainTreehugger Robot
2024-04-08Update AndroidX from build 11683807Anvesh Renikindi
Arguments: --include androidx.work --build 11683807 --upstream aosp/main Test: prebuilts Change-Id: I65ce2cb750db53e94c22ba0c1a26e21f096dcc87 Merged-In: Ia5b1dda3e0cb4b1b97449f176bb697b4d6f38e38
2024-04-08Update sdk_version to 34 for all Jetpack librariesAlan Viverette
Bug: 331987027 Test: it builds Merged-In: Ie22fea65471c7389a6d3caf7271c539c1ecffd71 Change-Id: Ie22fea65471c7389a6d3caf7271c539c1ecffd71
2024-04-08Merge "Update AndroidX from build 11683807" into mainAnvesh Renikindi
2024-04-08Merge "Update AndroidX from build 11683807" into mainAnvesh Renikindi
2024-04-08Merge "Update AndroidX from build 11683807" into mainAnvesh Renikindi
2024-04-08Update AndroidX from build 11683807Anvesh Renikindi
Arguments: --include androidx.fragment --build 11683807 --upstream aosp/main Test: prebuilts Change-Id: I824cdc5e225fac72ee804e0ea2f6de5c1cc6bd54 Merged-In: I563243532f2c3f9b5a1c4289a7b5c04673bbfbc8
2024-04-08Update AndroidX from build 11683807Anvesh Renikindi
Arguments: --include androidx.credentials --build 11683807 --upstream aosp/main Test: prebuilts Change-Id: I659be6143f7f076efc8c07a3b63e2ee380416655 Merged-In: Idc2ec52e9460fd80a7f7345bf8640907c6be91a8
2024-04-08Update AndroidX from build 11683807Anvesh Renikindi
Arguments: --include androidx.core --exclude androidx.core.uwb --exclude androidx.core.uwb:uwb-rxjava3 --build 11683807 --upstream aosp/main Test: prebuilts Change-Id: I8a4f25e115264cba3db7888a03351e9b8b17bf66 Merged-In: I4318712225b95b8fa91e753f102efd5f2b18241b
2024-04-05Merge "com.google.android.material minsdk bump version to 19" into mainTreehugger Robot
2024-04-05com.google.android.material minsdk bump version to 19Anvesh Renikindi
Test: Treehugger (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0d449dd512269f557b54828f094530f6caaaeb60) Merged-In: I8b581aaf83fac68e649a4c8b0ebbea68fd5bafc7 Change-Id: I8b581aaf83fac68e649a4c8b0ebbea68fd5bafc7
2024-04-04Merge "Update AndroidX from build 11667602" into mainAnvesh Renikindi
2024-04-04Merge "Update AndroidX from build 11667602" into mainAnvesh Renikindi
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 06:44:04 +0000