aboutsummaryrefslogtreecommitdiff
path: root/java/java_test.go
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add arch variant support to android_app_import.Jaewoong Jung2019-08-151-0/+2
| | | | | | | | | | | | | | Bug: 128610294 Fixes: 138792623 Test: app_test.go Change-Id: I47c80ec283ce58a0ce9b7d0af40844bd73e9d3f1
* | Merge "Add a rule about platform_apis"Jeongik Cha2019-07-301-0/+23
|\| | | | | | | | | | | am: 8a64f8c907 Change-Id: Ifdd8bd693fee625f63db403ce7a4dbc9209eb398
| * Add a rule about platform_apisJeongik Cha2019-07-291-0/+23
| | | | | | | | | | | | | | | | | | | | | | As sdk_check.mk checks, soong starts to check every app. If sdk_version is empty, platform_apis must be true. If sdk_version is not empty, platform_apis must be false. Test: soong test Test: m Bug: 132780927 Change-Id: I7ba702d616404d155f8ac40cd008828663ad1488
* | Merge changes Ic2a585ea,I11ccabc4,Icc932c4a,I020556c7,I08713e91Colin Cross2019-07-221-5/+0
|\| | | | | | | | | | | am: ed9a92c311 Change-Id: I0367335939181566063b777184e864a7afb02308
| * Merge changes Ic2a585ea,I11ccabc4,Icc932c4a,I020556c7,I08713e91Treehugger Robot2019-07-221-5/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix date on mac builds Convert javadoc modules to android.RuleBuilder Convert droiddoc modules to android.RuleBuilder Add a systemModules utility type Convert droidstubs to android.RuleBuilder
| | * Convert droiddoc modules to android.RuleBuilderColin Cross2019-07-181-5/+0
| | | | | | | | | | | | | | | | | | | | | Test: m docs Test: m checkapi Test: m updateapi Change-Id: Icc932c4a9a3fc642c96ab9cbd8df3229b5ab86d3
* | | filegroup.path is used to specify the include path for aidl filesJiyong Park2019-07-191-2/+15
|\| | | | | | | | | | | | | | | | | am: 2907459e43 Change-Id: Ibf604d664111401d4bcca20db20c754c6845f05a
| * | filegroup.path is used to specify the include path for aidl filesJiyong Park2019-07-191-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filegroup { name: "foo", srcs: ["srcs/aidl/com/android/**/*.aidl"], path: "srcs/aidl", } cc_library { // or java_library, etc. name: "bar", srcs: [":foo"], } automatically adds "-Ipath/to/foo/srcs/aidl" when compiling the aidl files from foo for bar. This allows us to omit aidl include path when using sources in other places via file group. Bug: 135922046 Test: m (unit tests added) Change-Id: I9b42f316f2858fb6da72c2f58a314f391416e809
* | | Merge "Java test code clean-up"Jaewoong Jung2019-07-181-23/+22
|\| | | | | | | | | | | | | | | | | am: 66bb414fb7 Change-Id: I69304bb2b589b5c415a5eb57cadc0833fd1be02e
| * | Java test code clean-upJaewoong Jung2019-07-171-23/+22
| |/ | | | | | | | | | | | | Remove unused parameters and make testJava return the config. Test: Ran all java tests. Change-Id: Iaa123f3fd93188e2f55452b887e1d340429cc710
* | Merge "Enforce hidden api usage in vendor (soong)" am: e65d84c84cJeongik Cha2019-06-301-0/+26
|\| | | | | | | | | | | am: 7a22534a47 Change-Id: Iffbacc0f98fb208e6f71919bcefa19cb0e57efca
| * Merge "Enforce hidden api usage in vendor (soong)"Treehugger Robot2019-07-011-0/+26
| |\
| | * Enforce hidden api usage in vendor (soong)Jeongik Cha2019-06-281-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From aosp/588578, if vendor app doesn't fill sdk_version, build scirpt overwrites system_current to sdk_version. But there is no similar enforcement in soong. So, as make does, sdkVersion() returns "system_current" if it is device-specific or soc-specific module. and sdk_version is not filled. Test: pass soong test Bug: 132780927 Change-Id: I69bb3d7bfcf7c27c2db4d0efbe046f9c7879b4bc
* | | Optionally embed NOTICE files in apks. am: 5b425e2e20Jaewoong Jung2019-06-251-0/+4
|\| | | | | | | | | | | | | | | | | am: 5d48965fed Change-Id: I533808f0eafb496c34ece9d100784ebb9b5257e6
| * | Optionally embed NOTICE files in apks.Jaewoong Jung2019-06-241-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | If embed_notices or ALWAYS_EMBED_NOTICES is set, collect NOTICE files from all dependencies of the android_app, merge them with the app's own one (if exists), transform it to HTML, gzip it, and put it as an asset in the final APK output. Bug: 135460391 Test: app_test.go Change-Id: I52d92e2fd19b3f5f396100424665c5cc344190d8
* | Merge changes I42cb181f,I6413c9b1 am: 33ee25466fPaul Duffin2019-06-171-1/+1
|\| | | | | | | | | | | am: 00c2bbb0e7 Change-Id: Icca90608b256e726a9a1bd79e9cedca1a6b53f84
| * Remove the no_standard_libs propertyPaul Duffin2019-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrects an error message that refers to no_standard_libs. Removes any tests that use no_standard_libs:true where possible as there are duplicate tests for sdk_version:"none". Otherwise, switches them over to use sdk_version:"none". The androidmk mapping from LOCAL_NO_STANDARD_LIBRARIES to no_standard_libs has also been removed. There was little point in updating the tool to map it through to sdk_version:"none" as there are only a couple of places where it is used, in art's test running mk targets and in some unbundled packages to work around some limitation in .mk based build. Bug: 134566750 Test: m droid Change-Id: I6413c9b1fe3e63b93753a6a017d2981e32b7e013
* | Merge "Add sdk_version:"none" to replace no_standard_libs:true" am: b11c72b0b8Paul Duffin2019-06-141-0/+13
|\| | | | | | | | | | | am: e34bbae1ca Change-Id: I9465a810dad7f3ea95b6c883844358d817f8cc8e
| * Add sdk_version:"none" to replace no_standard_libs:truePaul Duffin2019-06-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where possible this duplicates any tests that use no_standard_libs:true with ones that use sdk_version:"none". If not possible (e.g. in the default targets included in java/testing.go) it switches some to use sdk_version:"none" to ensure that there is no regression in the behavior of no_standard_libs:true. Follow up changes will switch all usages of no_standard_libs:true over to use sdk_version:"none" at which point no_standard_libs will be removed. Bug: 134566750 Test: m droid Change-Id: I5f0fd3daa980f6b223abe454cba7f25a97a39d7a
* | Merge "Allow java_test.go tests to use any Android.bp file" am: 45656aacabPaul Duffin2019-06-131-1/+1
|\| | | | | | | | | | | am: e6cb60da57 Change-Id: I0fedcef906e6e59e004115d421df1a152348a02c
| * Allow java_test.go tests to use any Android.bp filePaul Duffin2019-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previously, the tests had to use the Android.bp file in the root directory of the mock file system. That prevented adding tests that are dependent on the location of the Android.bp file, e.g. ones that use no_standard_libs. This change will process any Android.bp in the mock filesystem. Bug: 134566750 Test: m Change-Id: I6fb057a473a18e87bd1a89507e78ceb3fd171eb5
* | Merge "android_app stl property bug fix" am: 4f67c42d76Jaewoong Jung2019-06-051-0/+3
|\| | | | | | | | | | | am: 58d0f0cf69 Change-Id: Ic14f463f27b8413e0d4960658c41407763d79ba6
| * android_app stl property bug fixJaewoong Jung2019-06-041-0/+3
| | | | | | | | | | | | | | | | | | When it is set to c++_shared, the added dependency should be libc++_shared, not libc++. Fixes: 130891985 Test: app_test.go, atest 'CtsNdkBinderTestCases' w/ conversion CL Change-Id: I0e50e0d5bf511aa6e52d16cd715a185721011255
* | Merge "Port uses-shared library verification and dexpreopting to Soong" am: ↵Colin Cross2019-05-301-0/+2
|\| | | | | | | | | | | | | | | 7a1fefc2de am: 38ec6cfbf4 Change-Id: Ib9bbb720605f418d242aba98df9d9904671c29e4
| * Port uses-shared library verification and dexpreopting to SoongColin Cross2019-05-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ports 09f3b97f4b488cd3a7b7d72038b173575b02c162 (Add support for preopt with uses-libraries) from Make to Soong to support verifying and preopting shared libraries. This reapplies Id25f55f07a55120bebe2a9b32c094209efc85c8b with fixes for unbundled builds and builds with ALLOW_MISSING_DEPENDENCIES=true set. Bug: 132357300 Test: app_test.go Test: m checkbuild Change-Id: I964309a68ec4ed081f3f3154879c71048ecb5455
* | Merge "Revert "Port uses-shared library verification and dexpreopting to ↵Colin Cross2019-05-291-2/+0
|\| | | | | | | | | | | | | | | Soong"" am: 7d06395f0c am: cc50c0c4de Change-Id: I4e12ee0f7d2dbb293e492c55f2eae66dc9638266
| * Revert "Port uses-shared library verification and dexpreopting to Soong"Colin Cross2019-05-291-2/+0
| | | | | | | | | | | | | | | | This reverts commit b66d7b1c20f7e54a5920780ba6643e971d216d31. Reason for revert: broke unbundled builds Change-Id: I96ae287885107079de4a26e6b100ad8ed66961c0
* | Merge changes from topic "verify_uses_libraries" am: 2f4c55e9f7Colin Cross2019-05-291-0/+2
|\| | | | | | | | | | | am: 3c8e809052 Change-Id: I9bd1e0d745c605b3617576f9a6044527421fbfe4
| * Port uses-shared library verification and dexpreopting to SoongColin Cross2019-05-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | Ports 09f3b97f4b488cd3a7b7d72038b173575b02c162 (Add support for preopt with uses-libraries) from Make to Soong to support verifying and preopting shared libraries. Bug: 132357300 Test: app_test.go Test: m checkbuild Change-Id: Id25f55f07a55120bebe2a9b32c094209efc85c8b
* | Merge "Fix override_android_app dependency issues." am: 105920a792Jaewoong Jung2019-05-161-1/+1
|\| | | | | | | | | | | am: ac5ee3559f Change-Id: Ie6447241cc069f507d053e10d78ba540d9cc84f9
| * Fix override_android_app dependency issues.Jaewoong Jung2019-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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 "Rename EXPERIMENTAL_USE_OPENJDK9 to ↵Pete Gillin2019-05-101-5/+5
|\| | | | | | | | | | | | | | | EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." am: 42e862c56d am: 350f0987bf Change-Id: Ibfc75aa4c4356d86cf7ce80becff0cf92cf98e14
| * Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."Pete Gillin2019-05-101-5/+5
| |\
| | * Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.Pete Gillin2019-05-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Implement DPI variants in android_app_import." am: 53ad63c127Jaewoong Jung2019-05-081-1/+3
|\| | | | | | | | | | | | | | | | | am: a64eb7eada Change-Id: Idcfca3ed5cbeb4955958d007ef701939cd3f26ae
| * | Merge "Implement DPI variants in android_app_import."Jaewoong Jung2019-05-081-1/+3
| |\ \
| | * | Implement DPI variants in android_app_import.Jaewoong Jung2019-05-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 128610294 Test: app_test.go Change-Id: Ie3e558bfdb40de6b0b9df95d3b373d08a4084d7b
* | | | Merge "Track sources for srcjars across modules" am: 082640d6eeColin Cross2019-05-071-6/+63
|\| | | | | | | | | | | | | | | | | | | | | | | am: 222f5ee5f2 Change-Id: I1787ef4d66ebd129a15536b1455139235613ce2c
| * | | Track sources for srcjars across modulesColin Cross2019-05-061-6/+63
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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 "Add android_app_import." am: e7d52c779fJaewoong Jung2019-05-021-0/+3
|\| | | | | | | | | | | | | | | | | am: 5fa44dfb04 Change-Id: I1ec1d30fe592f1997f41eb66f1ad85d9b2b4abeb
| * | Add android_app_import.Jaewoong Jung2019-05-011-0/+3
| |/ | | | | | | | | | | | | | | This is an initial version that handles the most basic cases. Bug: 128610294 Test: app_test.go + prebuilt webview.apk Change-Id: Ic525559aad5612987e50aa75b326b77b23acb716
* | Merge "Build framework.aidl in Soong" am: 8bf9bd9f91Colin Cross2019-04-211-1/+2
|\| | | | | | | | | | | am: 2e2967423a Change-Id: I177c278e520177929aeb76fc1ce6f05ebc576a20
| * Merge "Build framework.aidl in Soong"Colin Cross2019-04-211-1/+2
| |\
| | * Build framework.aidl in SoongColin Cross2019-04-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the rules to build framework.aidl into Soong, and use it when compiling aidl files with sdk_version: "current". Also fixes incorrectly using the aidl includes exported by the "framework" module when the proguardRaiseDep dependency was added. Bug: 130798034 Test: sdk_test.go Change-Id: I126adf1d9e7b6acb528875ff62b974ba7ad9a337
* | | Merge "Fix handling optimize.enabled from java_defaults" am: 36ab727c82Sasha Smundak2019-04-191-0/+32
|\| | | | | | | | | | | | | | | | | am: 2f65feddde Change-Id: I9ba47791f33c2722140dcfa3ddfe2b649ee3d9bd
| * | Fix handling optimize.enabled from java_defaultsSasha Smundak2019-04-171-0/+32
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Some module types (`android_test`, etc.) set `optimize.enabled` by default. If such module happens to have `defaults` attribute which clears `optimize.enabled`, the latter value is ignored. Fixes: 129858282 Test: unit tests in java_test.go, `atest CtsExtendedMockingTestCases` succeeds with aog/936802 reverted (that is, with cts/test/mocking converted to Android.bp) Change-Id: Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c
* | Add support for prebuilt java_sdk_library modules am: 79c7c26d8aColin Cross2019-04-171-1/+12
|\| | | | | | | | | | | am: c1afb65520 Change-Id: Ia26c7f53332a4821218476d6c796f7ab39928b87
| * Add support for prebuilt java_sdk_library modulesColin Cross2019-04-171-1/+12
| | | | | | | | | | | | | | | | | | | | Add java_sdk_library_import for use when a java_sdk_library may be used by unbundled branches that do not have the project that contains the original java_sdk_library module. Bug: 130287656 Test: m checkbuild Change-Id: I62df4bccc0da95ed6c8b31dab8f2c32cc3215e9e
* | Merge "Use LoadHook to create modules in java_sdk_library" am: 59d4a31063Colin Cross2019-04-171-1/+0
|\| | | | | | | | | | | am: 414d337702 Change-Id: Ide9449f45066883662d05946fbbd43b142ec208f
| * Use LoadHook to create modules in java_sdk_libraryColin Cross2019-04-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | Creating new modules in a mutator is dangerous, as other mutators that need to see the new modules may already have run, in this case the prebuilts mutator. Move SdkLibraryMutator to a LoadHook instead. Also moves registering the LoadHook mutator to testing.go so it is registered for all tests. Test: m checkbuild Change-Id: I08bd76a0e6205d2ca27861058067a1562c339eed