aboutsummaryrefslogtreecommitdiff
path: root/java/java_test.go
Commit message (Collapse)AuthorAgeFilesLines
...
* Add java file resources and flag to include sourcesColin Cross2017-09-291-0/+74
| | | | | | | | | Add a properties to allow including files as resources, including support for filegroups. Also add a flag that causes module sources to be included in the final jar. Test: java_test.go TestResources Change-Id: Ida8ee59b28df9fe66952170f46470d3a09fd5d65
* Use pre-desugar classes in classpathColin Cross2017-09-291-5/+5
| | | | | | | | Follow the make change in I87aee34940937dbde33a977f55d1faf2c8054561 to use classes before desugar in the classpath. Test: java_test.go Change-Id: I1054f4aea1eb349b6f687e1af0adb92a944fd8c5
* Remove android_prebuilt_sdk modulesColin Cross2017-09-201-19/+12
| | | | | | | | Forcing sdk modules to be declared explicitly is unnecessary, just add the required dependencies on the jar and aidl files. Test: java_test.go Change-Id: Ib28bdc1051c5825e7c0efb6adff1f9282675560e
* Fix java sdk testsColin Cross2017-09-201-76/+144
| | | | | | | | Fix the java module sdk tests, and expand them to cover testing all classpaths including for the host. Test: java_test.go Change-Id: I71be13cc5545f5c4d5b377c4c8de3dccbb09abf9
* Convert java tests to NewTestArchContextColin Cross2017-09-201-13/+22
| | | | | | | | | | | | Java tests will need to test code inside if ctx.Device() blocks, switch to using TestArchConfig and NewTestArchContext. Disable TestSdk for now, just registering modules that depend on the SDK triggers panics because of previously untested code that is now executed. Test: java_test.go Change-Id: Iff2c814af56cc830327db8d951c4350034c00361
* Initial device java supportColin Cross2017-09-201-5/+5
| | | | | | | | First pass at java support for the device. Adds desugar before dx, and passes javalib.jar to make. Test: m -j checkbuild Change-Id: I3138d943bc4867a52c3fce8fbdb597773793988d
* Rearrange manifest file handling in merge_zips and soong_zipColin Cross2017-09-201-5/+5
| | | | | | | | | | | | | Jar always puts default MANIFEST.MF files in if none was specified. Copying that behavior in soong_zip causes problems with merge_zips, because it ends up taking the default manifest from the classes.jar instead of the user's manifest from res.jar. We don't want the user's manifest in the classes.jar, otherwise a change to the manifest will cause all the class files to rebuild. Instead, move the manifest insertion to the final merge_zips stage. Test: m -j checkbuild Change-Id: Id6376961dbaf743c2fb92843f9bdf2e44b963be0
* Make javac rules output a jar with soong_zipColin Cross2017-09-051-15/+20
| | | | | | | | | | | | Make javac rules output a jar file instead of a classes.list. Combine the output jar, static jar dependencies, and resources into the final jar using a separate rule. For now, use a shell command with unzip and soong_zip to create the final jar, eventually it will be done with a zip2zip-style jar combiner. Bug: 64691570 Test: java_test.go Change-Id: Id8e6313e0097b78947d88e86e47b56ad08caca1a
* Rename no_standard_libraries to no_standard_libsColin Cross2017-08-311-1/+1
| | | | | | | | For consistency with libs and static_libs. And make it a *bool so that it can be overriden when used in java_defaults modules. Test: java_test.go Change-Id: If0eaf5d5571dc6e565056d273b0addd960d6b33f
* Add core-oj to bootclasspathColin Cross2017-08-311-7/+15
| | | | | | | | Also clear the bootclasspath for device builds so javac doesn't fall back to the default rt.jar bootclasspath. Test: java_test.go Change-Id: Ia21f55c7d45db560e2f44be81b2f46587d9026f2
* Rename java_prebuilt_library to java_importColin Cross2017-08-111-6/+6
| | | | | | | | And make it work like bazel's java_import, using a "jars" property instead of "srcs", and allowing multiple jars to be listed. Test: soong tests Change-Id: Ida2ace6412bd77b4feb423646000a1401004e0ea
* Fix java prebuiltsColin Cross2017-07-311-0/+2
| | | | | | | | | | | The java prebuilt tests weren't registering the prebuilts mutators, which hid an issue where prebuilts modules weren't getting renamed to avoid collisions with source modules of the same name, which ended up causing the prebuilt module to try to add a dependency on itself. Test: java_test.go Change-Id: I3327d27533591cb08a4b8b8b5e1668a6f72be8df
* Rename names in java package to not have java prefixColin Cross2017-07-201-2/+2
| | | | | | | | | | Prefixing names in the java package with "java" is redundant, inside the java package it is clear that they refer to something java related, and outside the package they will be referred to with a java. prefix. Test: java_test.go Change-Id: I9eb8eecb7ac5f6fbf8e87f5c219b3f50dbd18c87
* Add support for java_defaults modulesColin Cross2017-07-201-0/+45
| | | | | Test: java_test.go Change-Id: I6dba1671c7eb019183af94bb7b10810296740101
* Rename java module and property names for consistencyColin Cross2017-07-191-7/+7
| | | | | | | | | | | | prebuilt_java_library -> java_prebuilt_library prebuilt_sdk -> android_prebuilt_sdk java_resource_dirs -> resource_dirs exclude_java_resource_dirs -> exclude_resource_dirs java_libs -> libs java_static_libs -> static_libs Test: java_test.go Change-Id: Icb0eefa6663844e20ad0a8729fb2c90ec916c3eb
* Add basic tests for java modulesColin Cross2017-07-191-0/+240
Java modules have been unused for a few years, add a few very basic tests to exercise the modules as they are brought up to date. Test: java_test.go Change-Id: Ib23fc065674a61308333130ff1a992525b92e705