aboutsummaryrefslogtreecommitdiffstats
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add kotlin-stdlib-jdk8 when using Kotlin"Colin Cross2019-05-212-2/+5
|\
| * Add kotlin-stdlib-jdk8 when using KotlinColin Cross2019-05-152-2/+5
| | | | | | | | | | | | | | | | kotlin-stdlib-jdk8 contains extensions to the Kotlin standard library for use when targeting Java language level 8. Test: m checkbuild Change-Id: Iac5f977f9080d8e0e2402b08a992a93c909744e9
* | Merge "Avoid targeting Java 9 for targets with SDK version up to 29."Pete Gillin2019-05-211-1/+1
|\ \
| * | Avoid targeting Java 9 for targets with SDK version up to 29.Pete Gillin2019-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Targets with sdk_version values up to and including 29 should not use Java language level 9, even if EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true is set. This change fixes a downstream issue. Bug: 131678633 Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make droid tests docs cts java Test: (same test in downstream branch) Change-Id: Ic58e8df2e06d6e07bc42255314521831dc41b239
* | | Merge "Turn off dex actions for sourceless modules."Jaewoong Jung2019-05-162-10/+31
|\ \ \
| * | | Turn off dex actions for sourceless modules.Jaewoong Jung2019-05-152-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | Test: dexpreopt_test.go Fixes: 129370564 Change-Id: Ic292f37c4f782b14fce625b85817b58c31d3f276
* | | | Merge "Fix override_android_app dependency issues."Jaewoong Jung2019-05-163-8/+55
|\ \ \ \
| * | | | Fix override_android_app dependency issues.Jaewoong Jung2019-05-153-8/+55
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes an issue where an android_test could not depened on an override_android_app or an android_app overridden by one by moving all override processing to post-deps and forwarding incoming dependencies on override_android_apps to base android_app modules Fixes: 132447700 Test: app_test.go Change-Id: I4ac593be661f541f5ea9823ef97373bee4b186f9
* | | | Merge "Add No_dist property"Treehugger Robot2019-05-151-45/+54
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add No_dist propertySundong Ahn2019-05-141-45/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the sysprop apis, we don't need dist. So the No_dist property is added for it. Bug: 132448761 Test: m -j dist Change-Id: I51c6a6b87ab9dc90b6825c0d4d414e958dd7b265
* | | | manifest_fixer argument should be --use-embedded-dex rather than ↵Sasha Smundak2019-05-141-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | --use-embedded-dex=true Test: building soong tests, treehugger Change-Id: Id0df92171a2e547794979fb473d8abc47f33d13c
* | | Merge "Fixes typos in device_host_converter.go comments."Treehugger Robot2019-05-131-2/+2
|\ \ \
| * | | Fixes typos in device_host_converter.go comments.Jaewoong Jung2019-05-131-2/+2
| | | | | | | | | | | | | | | | | | | | Test: TreeHugger Change-Id: Ie786e8fc950c3e9913c9d51f2b88bc036bb17462
* | | | Merge "Don't hide *.kotlin_module in turbine dependencies"Treehugger Robot2019-05-133-6/+16
|\ \ \ \
| * | | | Don't hide *.kotlin_module in turbine dependenciesColin Cross2019-05-083-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The jars containing the merged header classes from transitive static dependencies were stripping all of META-INF/. Kotlin puts metadata in META-INF that is used to map the package to the static class that contains the package-level functions. This also exposed that the metadata in META-INF is always called "name.kotlin_module", so a library that contains kotlin files with a dependency that also contains kotlin files would shade the metadata file. Use a unique name instead. Fixes: 131709692 Test: m checkbuild Change-Id: I5cd276e563206e37c4c0d90fe9f346e9396f88c0
* | | | | Merge "Uncompress dex file in imported apk when needed."Jaewoong Jung2019-05-131-0/+18
|\ \ \ \ \
| * | | | | Uncompress dex file in imported apk when needed.Jaewoong Jung2019-05-091-0/+18
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the uncompress-dexs macro's behavior in Soong. Test: Converted TvSampleLeanbackLauncher + zipinfo Change-Id: I9477aa21429d055f3f36ca90c7fd2c345c999029
* | | | | Merge "Make core-generated-annotation-stubs link as core stubs."Pete Gillin2019-05-131-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make core-generated-annotation-stubs link as core stubs.Pete Gillin2019-05-101-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 123891440 Test: EXPERIMENTAL_USE_OPENJDK9=true make droid (cherry picked from commit 4528becc46d69963a838c5af05e6ad9075b63bbe) Merged-In: I117828f13a604030d1c36bdb60fffec4c4e08d6e Change-Id: I17fa4e0c4106b63bf3cb0e3c3f78498a4072d9f5
* | | | Merge "Write dexpreopt.config again during the build"Colin Cross2019-05-102-8/+39
|\ \ \ \ | |/ / / |/| | |
| * | | Write dexpreopt.config again during the buildColin Cross2019-05-102-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Writing $OUT/dexpreopt.config during build setup and then using it during the build causes bad incremental builds if a cleanspec removes $OUT/dexpreopt.config. Create a rule in Soong to write out a copy so that it is a normal build artifact. Bug: 132379813 Test: m checkbuild Change-Id: I7755a7f8c1d6561fc83022a7f4cf7e4a64e989c9
* | | | Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."Pete Gillin2019-05-102-10/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.Pete Gillin2019-05-092-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current EXPERIMENTAL_USE_OPENJDK9 environment variable is a legacy from when the 8 -> 9 toolchain upgrade was happening. That migration is done and the variable only affects the language level, so it should have a name that reflects that. (The current situation would be especially confusing if we started a 9 -> 11 toolchain upgrade, presumably controlled by a variable like EXPERIMENTAL_USE_OPENJDK11, since the two settings look incompatible but are actually orthogonal.) The current variable historically allowed a value or "1.8" which meant "use the OpenJDK 9 toolchain but target language level 8". That value no longer has any meaning and the new variable doesn't allow it. Bug: 131678633 Test: `make` with `EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true` Test: `javap -v $OUT_DIR/soong/.intermediates/libcore/core-oj/android_common/javac/classes/java/util/List.class | grep 'major version'` shows 53 Test: Audit all mentions of the old string here and downstream Change-Id: Idad808c7f07913baba1a777627322d5452dabcef
* | | | Merge "Fix dangling rules on aosp_cf_x86_phone"Treehugger Robot2019-05-092-12/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix dangling rules on aosp_cf_x86_phoneColin Cross2019-05-082-12/+29
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aosp_cf_x86_phone uses SecondArchIsTranslated, which was leaving a dangling rule from the oatdump rules to out/soong/vsoc_x86/dex_bootjars/system/framework/arm/boot.art. Consolidate the code to select targets for dexpreopting and use it in more places to prevent references to boot images that were not generated. Test: m checkbuild Change-Id: Ia4945a99ff5e575e759299106559c85f38489acc
* | | Merge "Implement DPI variants in android_app_import."Jaewoong Jung2019-05-083-9/+166
|\ \ \ | |/ / |/| |
| * | Implement DPI variants in android_app_import.Jaewoong Jung2019-05-073-9/+166
| | | | | | | | | | | | | | | | | | Bug: 128610294 Test: app_test.go Change-Id: Ie3e558bfdb40de6b0b9df95d3b373d08a4084d7b
* | | Merge "Track sources for srcjars across modules"android-o-mr1-iot-release-1.0.12Treehugger Robot2019-05-075-27/+111
|\ \ \
| * | | Track sources for srcjars across modulesColin Cross2019-05-065-27/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Robolectric coverage needs a srcjar that sometimes needs to include sources of dependencies. Track the arguments and dependencies necessary to jar the sources. Test: TestIncludeSrcs Change-Id: I9979d2b8350923a2237e743c232e6e548f54ba3b
* | | | Merge "Allow module types to generate resources"Treehugger Robot2019-05-072-1/+16
|\| | | | |/ / |/| |
| * | Allow module types to generate resourcesColin Cross2019-05-062-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Robolectric will need to generate extra resources to be added to the jar. Test: TestResources Change-Id: I028f91ea8fc5d1e59e4e805876d70f57d8899f11
* | | Merge "uncompressedDex option for android_app_import."Jaewoong Jung2019-05-061-12/+18
|\ \ \ | |/ / |/| |
| * | uncompressedDex option for android_app_import.Jaewoong Jung2019-05-031-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | This also partially consolidates shouldUncompressDex implementations. Bug: 128610294 Test: TreeHugger Change-Id: I7cea5a3890ddd473f63c0738a35af067455b5c4d
* | | Add native_bridge target to Android.bpdimitry2019-05-032-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to build guest libraries for the native bridge for arm/arm64 architectures. Bug: http://b/77159578 Test: make Change-Id: I35520ca456105ddadd456c78a4eb1e6de39147c5
* | | Merge "Fix use_embedded_native_libs handling for android_test"Treehugger Robot2019-05-023-9/+11
|\ \ \
| * | | Fix use_embedded_native_libs handling for android_testSasha Smundak2019-05-013-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `use_embedded_native_libs: true` should cause `--extract-native-libs=false` be added to the manifest_fixer invocation, and it was not happening. There are also minor naming improvements. Bug: 117618214 Test: treehugger and 'atest CtsDynamicLinkerTestCases' after cts/tests/tests/dynamic_linker has been converted to Android.bp. Change-Id: I93ec2aed3f3b185d320e56b1b4eebb71339b81ee
* | | | Merge "Support robolectric_test"Colin Cross2019-05-021-0/+110
|\ \ \ \ | |_|/ / |/| | |
| * | | Support robolectric_testColin Cross2019-05-011-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | robolectric_test will compile a suite of tests that run in robolectric. For now it also generates a Run* rule, later that will be removed in favor of atest. Bug: 123248659 Test: m RunSettingsLibRoboTests Change-Id: I12407d0b0d639e31c1969077ba787e8985e6a506
* | | | Merge "Add android_app_import."Jaewoong Jung2019-05-026-31/+286
|\ \ \ \
| * | | | Add android_app_import.Jaewoong Jung2019-05-016-31/+286
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This is an initial version that handles the most basic cases. Bug: 128610294 Test: app_test.go + prebuilt webview.apk Change-Id: Ic525559aad5612987e50aa75b326b77b23acb716
* | | | Merge "Reverse merge order of resources and implementation"Treehugger Robot2019-05-011-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Reverse merge order of resources and implementationColin Cross2019-04-291-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the resources first in case one of the static libraries merge into the implementation jars contains a duplicate resource. Also put the manifest into the resource jar so that the default manifest doens't override the custom manifest. Test: m checkbuild Change-Id: I96d117c306bc9f1346720251d3993031992cef66
* | | Merge "Add ART folks to owner of dexpreopt related file."Nicolas Geoffray2019-04-301-1/+1
|\ \ \ | |_|/ |/| |
| * | Add ART folks to owner of dexpreopt related file.Nicolas Geoffray2019-04-301-1/+1
| |/ | | | | | | | | Test: N/A Change-Id: If8c7b1801e4a08e38ab75b459d9d8eff22804f06
* / Pass other boot classpath locations to the apex image.Nicolas Geoffray2019-04-301-8/+16
|/ | | | | | | | | | In order to evaluate the impact of framework classes being in an image. Test: m Bug: 119800099 Exempt-From-Owner-Approval: this is only for an experimental config, which we would like to see the performance before build snap. Change-Id: Ib0d3acf8d2718ee443b3bffe8122a54f92257691
* Merge "Tag dex_preopt.profile as a path"Treehugger Robot2019-04-261-1/+1
|\
| * Tag dex_preopt.profile as a pathColin Cross2019-04-261-1/+1
| | | | | | | | | | | | | | | | Tag dex_preopt.profile with `android:"path"` so that it can be used with a filegroup. Test: m checkbuild Change-Id: I5d6bbfcfcf0a1a22c9478ad57d0c55fb9b9efadd
* | Merge changes Id93bcaea,Ia8f9f910Treehugger Robot2019-04-253-48/+75
|\| | | | | | | | | | | * changes: Pass --remove-tools-declarations to manifest merger Don't use merged manifest for android_library modules
| * Pass --remove-tools-declarations to manifest mergerColin Cross2019-04-242-4/+13
| | | | | | | | | | | | | | | | | | Manifest merger needs --remove-tools-declarations to match Gradle behavior. Bug: 112607039 Test: m checkbuild Change-Id: Id93bcaeaf03770a4acd2e1fdf44e418f55540dd3
| * Don't use merged manifest for android_library modulesColin Cross2019-04-243-46/+64
| | | | | | | | | | | | | | | | | | | | | | | | Don't use the merged manifest for android_library modules. We still have to run manifest merger for android_library modules because Make can't handle transitive dependencies, so it will continue to merge the manifests at each library, and then merge the manifests of direct dependencies into the final application. Bug: 113294940 Test: m checkbuild Change-Id: Ia8f9f910bd0a134730ddf2d542460eeddbc0a075
generated by cgit v1.2.3 (git 2.39.2)