summaryrefslogtreecommitdiff
path: root/java
AgeCommit message (Collapse)Author
2023-05-12Dexpreopt ART jars and framework jars together. Jiakai Zhang
Bug: 280776428 Test: atest art_standalone_dexpreopt_tests Test: - 1. m 2. Check .invocation file (http://gpaste/6498044089466880) 3. Check files in $ANDROID_PRODUCT_OUT/system/framework/x86_64 Test: - 1. m dist 2. Check files in out/dist/boot.zip Test: - 1. art/tools/buildbot-build.sh --host 2. m test-art-host-gtest 3. art/test/testrunner/testrunner.py --host Test: m build-art-target-golem (cherry picked from https://android-review.googlesource.com/q/commit:c08c162b5a82ddfc44e9944d798636b2241308de) Merged-In: I89490252e56a05edab03fdddc6539fa4d7f79756 Change-Id: I89490252e56a05edab03fdddc6539fa4d7f79756
2023-05-12Unify installDirOnHost and installDirOnDevice. Jiakai Zhang
These two fields never do what they are described to do. This CL unifies them to avoid the confusion. Bug: 280440941 Test: m (cherry picked from https://android-review.googlesource.com/q/commit:09d88df0407263e846b01c226184b262f2e36678) Merged-In: I3652d73a50832a2e494d9f5cae750f5fc38293b4 Change-Id: I3652d73a50832a2e494d9f5cae750f5fc38293b4
2023-05-12Remove the ability to install boot images by bootclasspath_fragments. Jiakai Zhang
We don't need this anymore because we are going to compile ART jars and framework jars together. Bug: 280776428 Test: m (cherry picked from https://android-review.googlesource.com/q/commit:b47caccbc037b65462f757c462a99732ad6dd51c) Merged-In: I070157530449a1bb5779e25984c367df3dde7b36 Change-Id: I070157530449a1bb5779e25984c367df3dde7b36
2023-05-12Prepare tests for dexpreopt changes. Jiakai Zhang
After this change, there is a clear separation between tests that are related to dexpreopt and tests that are not. The former uses PrepareForTestWithDexpreopt, while the latter uses PrepareForTestWithJavaDefaultModules. The benefit is that the latter will no longer affected by any dexpreopt changes. Bug: 280776428 Test: m nothing (cherry picked from https://android-review.googlesource.com/q/commit:b95998be731406209f18fab764b96421a17ab4c9) Merged-In: Ib957765b9287d51c082e0a33cee17a6bb56daeef Change-Id: Ib957765b9287d51c082e0a33cee17a6bb56daeef
2023-05-12Get rid of DeviceName() from path related to dexpreopt Jeongik Cha
As-is, dexpreopt config and bootjar is in the dir including DeviceName(). It causes unnecessary dexpreopt invocation when target is changed repeatly. To avoid it, rename dir to common name. Bug: 278833696 Test: m (cherry picked from https://android-review.googlesource.com/q/commit:4753b39ccaaf573910e6b7a4200e9ca03ec8d96d) Merged-In: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c Change-Id: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c
2023-05-09Generate app profiles even if dexpreopt is disabled. Jiakai Zhang
Bug: 280440941 Test: - 1. Patch ag/22302622 to disable dexpreopt. 2. lunch aosp_cf_x86_64_phone-userdebug && m 3. See app profiles still generated. Test: - 1. Patch ag/20592051 to enable profile for service-art. 2. banchan com.android.art x86_64 && m 3. See the profile for service-art generated. (cherry picked from https://android-review.googlesource.com/q/commit:cf61e3c59133227894ac7d72091b48451a3e6761) Merged-In: I6090b4b74cedb6d129fcbeef58d075c8ccdcc4e2 Change-Id: I4e721b475b84a2f667bbccc030a8947078f26bb0
2023-05-09Generate boot image profiles even if dexpreopt is disabled. Jiakai Zhang
Bug: 280440941 Test: - 1. Patch ag/22302622 to disable dexpreopt. 2. See boot image profiles still generated. (cherry picked from https://android-review.googlesource.com/q/commit:bc698cd28aa2ee17af208bfd56f003347116ddb0) Merged-In: I5f7f746ca1d4da660fe0c40115e6c71750dfdccc Change-Id: I1bf05ade53fa83f3dba46f28a8f9246ba1fdf664
2023-04-29target_sdk_version replacement should respect REL branches Spandan Das
Currently, target_sdk_version of MTS tests were being set to 10000 even in release branches. This should only happen in active branches. Test: Unit test Test: aapt2 on CtsContentTestCases in udc-dev and verified targetSdkVersion is 34 Bug: 279507428 Change-Id: Ib79318febc0f6e771b3679c0281a97357930ec56 Merged-In: Ib79318febc0f6e771b3679c0281a97357930ec56 (cherry picked from commit fb6a1ee68bd7b17d1a8632082de88504dddc3540)
2023-04-21UpsideDownCake/34 is now REL Alex Buynytskyy
Ignore-AOSP-First: UpsideDownCake Finalization Bug: 275409981 Test: build Change-Id: Iaa3054f3449a5bf6887c24937646d22c79c4af1e Merged-In: Iaa3054f3449a5bf6887c24937646d22c79c4af1e
2023-04-18Merge "Add additional java_api_library module to java testing" am: ↵ Jihoon Kang
d1a038c183 am: 8ce85df02b am: 115dae4d1c Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541410 Change-Id: Ib53077770b1d8ea6014b4128f1d52986590da2f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17Add additional java_api_library module to java testing Jihoon Kang
Module lib surface is comprised of contributions from art, conscrypt, and i18n api domains. On top of this, the module lib api surface generates an additional stub library containing the contributions of the non-updatable api domains. Adding this additional module to the testing module enables more thorough testing of module lib api scope java_api_library modules. Test: m Change-Id: Ia648651fb9e6cba2642de7e8d39047d888bf49ce
2023-04-14Merge "Remove special handling of prebuilt_framework-res" am: 35dcf77fb6 am: ↵ Cole Faust
76093aad8d am: 4d76485722 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536611 Change-Id: I194b57c9dd723a058f14f354b539da9407dc2128 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Remove special handling of prebuilt_framework-res Cole Faust
prebuilt_framework-res doesn't appear to exist anymore. Bug: 185811447 Test: m nothing Change-Id: Ib1aa929fbe007f87d03bdc85e4d54c6fae4e510b
2023-04-13Merge "Bp2build support for sdk_version and java_version." am: a3c029e7d5 ↵ Romain Jobredeaux
am: f8ebe7f3e8 am: e9ab0a3cef Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454209 Change-Id: I37aac3f2bc75d86d40dc673cb0a43c475abd41cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Bp2build support for sdk_version and java_version." Romain Jobredeaux
2023-04-11Bp2build support for sdk_version and java_version. Romain Jobredeaux
This CL adds java_version and sdk_version support to bp2build converters for - java library - java binary - android library - android binary - android library import Although java import doesn't support java_version and sdk_version, the neverlink java_library wrapper around a java_import must specify a sdk_version when targetting a device. "none" is used by convention. Change-Id: I22a69dea2e351858368df69ed6a703b568d613ea Bug: 215230098 Test: Presubmits
2023-04-06UpsideDownCake is now 34 Alex Buynytskyy
Ignore-AOSP-First: UpsideDownCake Finalization Bug: 275409981 Test: build Change-Id: I70da9e094781c49ce3fa905e202fa0114696aa77
2023-04-06Merge "Update java_api_library in testing modules" am: 3bfba4c723 am: ↵ Jihoon Kang
7cec47c124 am: 81e8a21ee4 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2523975 Change-Id: I936b1c9851140426a9cf8e2d4f3a91068c774246 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05Merge "Update java_api_library in testing modules" Jihoon Kang
2023-04-05Merge "Bp2build converter for java_host_for_device." am: 15807fa7ed am: ↵ Romain Jobredeaux
e1a37d8189 am: c886dff902 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2522155 Change-Id: Iefbd54374bb9a8150a39f3385c1fd5bb80945e34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05Merge "Support arch variants in java's StaticLibs in bp2build" am: ↵ Romain Jobredeaux
b2539d08ed am: 090223b966 am: d2c9df6b93 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2521437 Change-Id: If15fb36748be5ee25aa5783dc1c04437e8edc910 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05Merge "Bp2build converter for java_host_for_device." Romain Jobredeaux
2023-04-05Merge "Support arch variants in java's StaticLibs in bp2build" Romain Jobredeaux
2023-04-04Support arch variants in java's StaticLibs in bp2build Romain Jobredeaux
Test: Presubmits Bug: 276901800 Change-Id: I6058a726833ef10a5f470946e2d265b20fa547ce
2023-04-04Bp2build converter for java_host_for_device. Romain Jobredeaux
Change-Id: I70a345c641bbed3223dc6222062fb6948f7dc6cb Bug: 276710283 Test: Presubmit
2023-04-04Update java_api_library in testing modules Jihoon Kang
The full api surface java_api_library modules are currently defined as java_library modules instead of java_api_library modules. This change corrects this and modifies the DepsInfo of java_api_library so that it can be compatible in tests. Test: go ./java Change-Id: I540b5a930f506ce5f7663ab6e07c6df49af15cf9
2023-04-04Merge changes I0ab8459b,I2ef90f4d am: 28ba80665d am: 170e0c87a5 am: 15373a714b Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2521436 Change-Id: I401446ca9dc4a04da1092c1e4b76901ba491824f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04Merge changes I0ab8459b,I2ef90f4d Treehugger Robot
* changes: Create core-lambda-stubs from .txt files Fix the suffix used in names of java_system_modules
2023-04-04Merge "Add com.android.tools.r8.emitRecordAnnotationsExInDex flag" am: ↵ Victor Chang
32952b975d am: 7e1f02b9b9 am: 6f43448019 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2495879 Change-Id: Ie88dc2712045c9ae57f9db440c3c3ea4da9b73b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04Merge "Add com.android.tools.r8.emitRecordAnnotationsExInDex flag" Victor Chang
2023-04-04Merge "Add dep_api_srcs property to java_api_library module" am: 91a86d4112 ↵ Jihoon Kang
am: 6f8a62b72a am: 22bd36e459 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485976 Change-Id: I18de957424949775bfa3a6fec6534d37bb0d4f86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Create core-lambda-stubs from .txt files Spandan Das
APIs to compile lambda are part of art's toolchain api surface. Generating stubs from .txt files allows us to prune the remaining sdk dependencies on libcore/ that are not api files Test: m core-lambda-stubs.from-text (On top of change containing core.current.stubs.from-text and turning enabled: true) Change-Id: I0ab8459b9317cb055a434eb635ba06d38da5b92e
2023-04-03Fix the suffix used in names of java_system_modules Spandan Das
Test: N/A (enabled flag is still off) Change-Id: I2ef90f4d9099bf183d65dcf8ebdf532d5fa445b6
2023-04-03Merge changes Ib9ff4eb5,If27a050c am: 71585a0187 am: 2448d10b58 am: 7190c6776a Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516456 Change-Id: Icfe3bdd0065b2c60233ea6a3b184a9b274d4896f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Rename core stubs to .txt stubs if applicable" am: 77e3278c50 am: ↵ Spandan Das
ac7b7d2a89 am: 83f7ac9d8d Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514796 Change-Id: I13629ee9000f208c25ad53fe478bdd61b6be0823 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Add dep_api_srcs property to java_api_library module Jihoon Kang
Users can pass the jar-file creating module via dep_api_srcs property in java_api_library to create the jar file not by compiling the stubs generated from metalava but by extracting and zipping the class files from the jar file of the input module. Test: m android-non-updatable.stubs.from-text Bug: 273381329 Change-Id: Id1b75179111cc7ff45faaff58388db1347bb18e5
2023-04-03Merge changes Ib9ff4eb5,If27a050c Treehugger Robot
* changes: add *.from-text modules to the java test fixture Create a SetBuildFromTextStub method
2023-04-03Merge "Rename core stubs to .txt stubs if applicable" Spandan Das
2023-04-03Merge "Remove stub-annotations from art stubs system modules" am: 1c102d34b7 ↵ Treehugger Robot
am: 5485148807 am: da56dee349 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515531 Change-Id: I59aebc304bf7571fdc896f86bc85a0fdbcf26791 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Remove stub-annotations from art stubs system modules" Treehugger Robot
2023-03-31Merge changes Ie9d465f5,Idd89d656,I0a13a0e7 am: cdbb1a999f am: 09a2632958 ↵ Treehugger Robot
am: 5a512834bf Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513924 Change-Id: Ibecb97ca51c3417413d2eaced72ff41b17f0b5f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" am: 840d49a564 am: ↵ Treehugger Robot
0110b797e8 am: 2caef94970 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515436 Change-Id: Ibe1ef9d638b20f38753b767d24674bc97b6c337d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31Merge changes Ie9d465f5,Idd89d656,I0a13a0e7 Treehugger Robot
* changes: Create core_platform system modules from .txt files Create system modules using .txt stubs Create a defaults module for stripping out annotations
2023-03-31Remove stub-annotations from art stubs system modules Spandan Das
This system module is used to compile conscrypt and icu stubs. These have migrated to java_sdk_library that set `annotations_enabled: true` explicitly. Test: m Test: TH Change-Id: I65ceb1fbf0dcdbb3504b69ebce6ca8f0b67e964d
2023-03-31Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" Treehugger Robot
2023-03-31Merge changes I1ed3ab24,I68678ddf am: 2d704998f4 am: 9b9cda6b14 am: b05664f90c Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513937 Change-Id: Ibc9e5b8bea86717c670ff8d22bb8bf9a814a9c23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31rename aidl/library.bzl to aidl/aidl_library.bzl Sam Delmerico
Test: b test --config=android //build/bazel/... Change-Id: I7e22ee5ffa391ddaf43a3eec17812be78f2d86ab
2023-03-31Add com.android.tools.r8.emitRecordAnnotationsExInDex flag Victor Chang
It enables annotations for record components. Bug: 272698028 Test: m droid Change-Id: I9b45526c2dcdb2de458d874a0c222108a69eee71
2023-03-30add *.from-text modules to the java test fixture Spandan Das
Test: go build ./java Change-Id: Ib9ff4eb59ff63dc208b7a28626d42b53153c86d6
2023-03-30Merge "Modify Soong to utilize from-text android.jar in build" am: ↵ Treehugger Robot
bc2906efef am: e518bf7c3d am: 5746993043 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2411272 Change-Id: Ibb008c511597b5746bc9c70c9368c4a3fe3322da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-11-24 18:07:22 +0000