aboutsummaryrefslogtreecommitdiffstats
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge "Support package_splits"Treehugger Robot2019-03-207-10/+82
| |\ \
| | * | Support package_splitsColin Cross2019-03-197-10/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the package_splits list from the property to aapt2 as --split arguments, sign the extra outputs, install them, and add them as extra output files for SourceFileProducer. Bug: 127921149 Test: TestAppSplits Change-Id: Id94a53ae6a8a68ec81e98abba2fefc9c23feaa7a
* | | | Merge "Add Conscrypt to coverage" am: 36c70bcfcb am: cecf06a088Adam Vartanian2019-03-201-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 637c287938 Change-Id: I082f23363577177ac00ee8f706eee0a9d960c986
| * | | Merge "Add Conscrypt to coverage"Treehugger Robot2019-03-201-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Add Conscrypt to coverageAdam Vartanian2019-03-131-0/+1
| | |/ | | | | | | | | | | | | | | | Bug: 73156932 Test: manual coverage run Change-Id: I20dc1595ba55d8425bf16770c1f2e6e4fa8bffae
* | | Merge "Refine error messages in case of missing api files" am: 03a471a853 ↵Inseob Kim2019-03-201-0/+28
|\| | | | | | | | | | | | | | | | | | | | | | | am: 1c033c09d8 am: 165bafc1ce Change-Id: I55cbbefe510083e31a0bca3cf61781be1b4231de
| * | Refine error messages in case of missing api filesInseob Kim2019-03-201-0/+28
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Some non-interpretable error messages has been shown in case of missing current api files. Instead of that messy errors, This clearly tells users what is the problem and how to fix it. Bug: 126259114 Test: 1) try to build a sysprop_library and a java_sdk_library without creating txt files under api/, and see it fails. Test: 2) Copy and paste the emitted command, and try to build again. Change-Id: I986781cc710475647c2b996b0f1c51a6f50c0ba2
* | Merge "Differentiate system and test apis in whitelist" am: fdd1457fa6 am: ↵Andrei-Valentin Onea2019-03-091-2/+2
|\| | | | | | | | | | | | | | | 2af4ac8fa8 am: 4f0ca94115 Change-Id: Ifc224a414f5502fd437d49cfc0be8a42cfd33f26
| * Merge "Differentiate system and test apis in whitelist"Andrei-Valentin Onea2019-03-081-2/+2
| |\
| | * Differentiate system and test apis in whitelistAndrei Onea2019-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | @SystemApi and @TestApi entries in the whitelist can now be differentiated from the rest of the public apis. Test: m Change-Id: Ie6a0108540cffe11992739d6391531401378f14b
* | | Annotate paths and deprecate ExtractSource(s)Deps am: 27b922f53e am: e5f6f175a8Colin Cross2019-03-074-100/+28
|\| | | | | | | | | | | | | | | | | am: 8a098ecc62 Change-Id: I7d879187c748038ad64c3526148eaff7b7ba1a53
| * | Annotate paths and deprecate ExtractSource(s)DepsColin Cross2019-03-074-100/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add `android:"path"` to all properties that take paths to source files, and remove the calls to ExtractSource(s)Deps, the pathsDepsMutator will add the necessary SourceDepTag dependency. Test: All soong tests Change-Id: I488ba1a5d680aaa50b04fc38acf693e23c6d4d6d
* | | Merge "Add modules for converting java modules between host and device" am: ↵Colin Cross2019-03-054-0/+322
|\| | | | | | | | | | | | | | | | | | | | | | | e3ad4144db am: d5f25c7685 am: 3ce8fedd9a Change-Id: I09f01ae076b93cdec5b738eed00c2d7a40e5555d
| * | Add modules for converting java modules between host and deviceColin Cross2019-03-054-0/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java_device_for_host and java_host_for_device allow treating a device module as a host module and vice versa. They will be useful for converting layoutlib and robolectric to Soong, as these modules run device java code on the host. Bug: 117920228 Test: device_host_converter_test.go Change-Id: Ia9a371fb41a97bc16338097f3ce8b40099744167
* | | Add dexpreopt_bootjars_test.go am: 762286723a am: 2c81ab734fColin Cross2019-03-041-0/+103
|\| | | | | | | | | | | | | | | | | am: 15836b9ceb Change-Id: I4d047c47d783f6e788eeccdf83dab646338d15d8
| * | Add dexpreopt_bootjars_test.goColin Cross2019-03-051-0/+103
| | | | | | | | | | | | | | | | | | | | | Add a test that exercises the dexpreopt_bootjars.go singleton. Test: dexpreopt_bootjars_test.go Change-Id: I01d4f6e22f6ff7b809af043391d7b6209dcb8675
* | | Move some java test setup later am: c28bb0b8f9 am: 7e2b9c48caColin Cross2019-03-042-6/+6
|\| | | | | | | | | | | | | | | | | am: 7cb6f9e601 Change-Id: Ib0924d35bc9cd844a071e5f8729f5e2f7b8b6745
| * | Move some java test setup laterColin Cross2019-03-052-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move ctx.Register() from testContext() to run() so that tests can register more singletons before the env singleton is registered. Any singletons registered after the env singleton will hit an error if they attempt to read an environment variable. Move setDexpreoptTestGlobalConfig from TestConfig to run() so that a test can set their own custom config after TestConfig but before run(). Test: All Soong tests Change-Id: Iec47f4b7898736f583cbd6bd53e4d02a035f4fb2
* | | Update manifest merger to use binary am: 87ecbfe107 am: d8f3e6f5d4Colin Cross2019-03-043-19/+4
|\| | | | | | | | | | | | | | | | | am: 867b1daec4 Change-Id: I72f9f76865d19495cb340adcf5244e8c7f2f8a38
| * | Update manifest merger to use binaryColin Cross2019-03-043-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Manifest merger is now a java_binary instead of a collection of jars, it can use the single binary as the dependency. Bug: 112607039 Test: m checkbuild Change-Id: Iea6c97c99a3bb09952fed2b25437b644f4e863f8
* | | Replace *Escape with *EscapeList am: 0b9f31fb08 am: 5b6741d94dColin Cross2019-03-046-6/+6
|\| | | | | | | | | | | | | | | | | am: 29560640a9 Change-Id: I04930d0949d8fb3317317aad7f577b75e47a9505
| * | Replace *Escape with *EscapeListColin Cross2019-03-046-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the change to blueprint to make *Escape take and return a string and add *EscapeList that take and return slices of strings. Fix up a few places that were unnecessarily converting a string to a slice and back to a string. Test: m nothing Change-Id: I3fa87de175522205f36544ef76aa2f04aef1b936
* | | Merge "Ignore missing prebuilt_apis of java_sdk_library" am: 4be65809d7 am: ↵Inseob Kim2019-03-032-2/+39
|\| | | | | | | | | | | | | | | | | | | | | | | 8740b4c27a am: 28281cef98 Change-Id: I248d72e776b5bee568c1213b2ebd7130ce0793e6
| * | Merge "Ignore missing prebuilt_apis of java_sdk_library"Treehugger Robot2019-03-042-2/+39
| |\ \
| | * | Ignore missing prebuilt_apis of java_sdk_libraryInseob Kim2019-03-042-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building java_sdk_library without defining prebuilt_apis has been failing with weird error messages. So one have to touch empty txt files and create prebuilt_apis module, even when the java_sdk_library is brand-new and has no previous versions. This commit fixes it so that API check against previous version is skipped, in the case of missing prebuilt_apis. Note that Current api txt files (placed under api/ directory) are still needed (make update-api) Bug: 126259114 Test: tries to build without touching empty api txt files. Change-Id: I93630f4139cbf502621693ec315dc06c0d07d1c3
* | | | Don't add static libs resources to implemenation jars am: 247e0cfaa4 am: ↵Colin Cross2019-03-031-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cbdd49dc8 am: 8c25acf1fd Change-Id: I084f186143006b7f8d5e6ba519fd890354703174
| * | | Don't add static libs resources to implemenation jarsColin Cross2019-03-031-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Static dependency resources will already be in the resources jar and the implementation and resource jar, they shouldn't be in the implementation jar. Test: m checkbuild Change-Id: I4d4dab1d2e55e92ba9a95a66b246c721b9bf6410
* | | Optimize CPU time when running d8 and r8 am: 6db4d4e613 am: f334ea833fColin Cross2019-03-013-2/+5
|\| | | | | | | | | | | | | | | | | am: e6c2c1313c Change-Id: I3a6b7ec5ca04250ec7e0e333ef64d9cfe6133553
| * | Optimize CPU time when running d8 and r8Colin Cross2019-03-013-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass -XX:+TieredCompilation -XX:TieredStopAtLevel=1 to the JVM to reduce the time spent JITing, which in local experiments reduced the CPU time of R8 while increasing the wall time, and reduced the total number of runnable threads. Without the new flags: $ time out/soong/host/linux-x86/bin/r8-compat-proguard -injars out/target/common/obj/APPS/Dialer_intermediates/classes.jar ... real 0m30.090s user 4m35.337s sys 0m12.853s With the new flags: $ time out/soong/host/linux-x86/bin/r8-compat-proguard -JXX:+TieredCompilation -JXX:TieredStopAtLevel=1 -injars out/target/common/obj/APPS/Dialer_intermediates/classes.jar ... real 0m35.674s user 2m45.135s sys 0m9.531s The increase in wall time should be offset by the better parallelism from the reduced CPU time. Bug: 119270658 Test: m checkbuild Change-Id: I8fc78b5ef1f8c6f51fd97a29461b96ae2b35cada
* | | Merge "Move boot image oatdump phony rules into Soong" am: 292d6cfd73 am: ↵Colin Cross2019-03-011-0/+47
|\| | | | | | | | | | | | | | | | | | | | | | | 7cd2df4887 am: e3c13d6778 Change-Id: Ieb6f4e4b1af4340051012ad8fa2f7bbac34261f3
| * | Merge "Move boot image oatdump phony rules into Soong"Colin Cross2019-03-011-0/+47
| |\ \ | | |/ | |/|
| | * Move boot image oatdump phony rules into SoongColin Cross2019-02-281-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The boot image oatdump rules depend on the details of dexpreopting the boot image. Instead of exporting all of the necessary values to make, move the rules into Soong instead. Also removes the ART_DUMP_OAT_PATH variable, and moves the output to out/soong/boot.*.oatdump.txt. Test: m dump-oat-boot Change-Id: I055b1c39918ba3425c8393b3e1b5359df055472a
* | | Merge changes Ib0389900,Ib2d69dea am: e28d0c0ff3 am: 7204ec83efPaul Duffin2019-03-013-16/+36
|\| | | | | | | | | | | | | | | | | am: 1a5d25499a Change-Id: I5b2ce79790b12fab360339faba6f7ef548eb961a
| * | Merge changes Ib0389900,Ib2d69deaPaul Duffin2019-03-013-16/+36
| |\ \ | | |/ | |/| | | | | | | | | | * changes: Fix hiddenapi issue when REMOVE_ATB_FROM_BCP=true Improve hiddenapi processing so it does not require white list
| | * Fix hiddenapi issue when REMOVE_ATB_FROM_BCP=truePaul Duffin2019-02-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the android.test.base is not on the bootclasspath then its stubs should not be used as input to the hiddenapi processor. Bug: 73711752 Test: make REMOVE_ATB_FROM_BCP=true droid && atest -p cts/tests/signature Change-Id: Ib03899001e4350c9ad9e757e9e6d7d41bb0a3896
| | * Improve hiddenapi processing so it does not require white listPaul Duffin2019-02-282-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than have a special white list to contain the names of modules that provide additional hiddenapi for modules on the bootclasspath this defines a convention that such modules must have a name which is of the format <x>-hiddenapi, where <x> is the name of the module on the bootclasspath. Bug: 73711752 Test: make droid && flashall -w && atest -p cts/tests/signature Change-Id: Ib2d69dea9541b60a9bb81496f00edb65036d1ebb
* | | Merge "aapt2 flag for target manifest package override" am: ce3de3df0f am: ↵Jaewoong Jung2019-02-282-0/+38
|\| | | | | | | | | | | | | | | | | | | | | | | a58c5c8139 am: b3f3924119 Change-Id: I86cbc75abb59f1e88ae20cc1d8e7004405246ef1
| * | Merge "aapt2 flag for target manifest package override"Jaewoong Jung2019-03-012-0/+38
| |\ \
| | * | aapt2 flag for target manifest package overrideJaewoong Jung2019-02-282-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds an aapt2 flag, rename-instrumentation-target-package, when an android test's instrumention target module's manifest package name is overridden. Bug: 122957760 Test: app_test.go, atest DocumentsUITests Change-Id: I7116a51ec5ec9d61a20cd28509b3af0e383730d7
* | | | Merge "Add path valid check" am: 10d21fdcb9 am: 24801a3980Sundong Ahn2019-02-281-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | am: 37eed8fc81 Change-Id: I84e99e95c5a5e95ea105733b0ca8b88d61f1d033
| * | | Merge "Add path valid check"Treehugger Robot2019-03-011-0/+4
| |\ \ \ | | |/ / | |/| |
| | * | Add path valid checkSundong Ahn2019-02-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The path valid check is added for avoiding panic message Bug: 126612123 Test: tapas tradefed-all && make -j40 Change-Id: I76b79d5040db7168d8a8879f64349846005333b5
* | | | Merge "Revert "Add override_module."" am: ef36053829 am: 4ab2e63974Jaewoong Jung2019-02-283-57/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: d26cc522ac Change-Id: Iab70e8d689eea96831afd4f3b696122b98c99d9b
| * | | Merge "Revert "Add override_module.""Treehugger Robot2019-02-283-57/+1
| |\ \ \
| | * | | Revert "Add override_module."Jaewoong Jung2019-02-283-57/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit aa65e17016152d0d73cd10ab3987bc3bd5c2ef91. Reason for revert: Not compatible with PRODUCT_PACKAGES, and so has very limited use. Change-Id: Ib141d3984a6f12bb50989e66037494c466b066f1
* | | | | Merge "Add java_* 'services:' field" am: 6a48032fc9 am: 16189b6584Alex Light2019-02-281-0/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b2b83a47ca Change-Id: I1a218f1f88473d87b030d122e56ac8ce8fc8df43
| * | | | Merge "Add java_* 'services:' field"Alex Light2019-02-281-0/+23
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add java_* 'services:' fieldAlex Light2019-02-271-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some libraries rely on the java.util.ServiceLoader system to access classes. Allow java_* targets to specify the services that should be exposed there. Test: m jdi-support Bug: 124507633 Change-Id: I253a87033563e3aebc50250fe2252d80d2883815
* | | | | Merge "Revert "Support libraries (not just boot jars) that have hiddenapi"" ↵Paul Duffin2019-02-282-18/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 724c5fd813 am: 4a33f24c2c am: 927fba9706 Change-Id: I6c71b9199fe2d98dbcef61faaa7d00475cd6098a
| * | | | Merge "Revert "Support libraries (not just boot jars) that have hiddenapi""Paul Duffin2019-02-282-18/+3
| |\ \ \ \ | | |_|_|/ | |/| | |