Commit Graph

14 Commits

Author SHA1 Message Date
Paul Duffin
924431ff1a Merge "Replace legacy-test with android.test.base in bp files" am: 2285630e4b am: caacf3e7c4
am: 2b3bf45c73

Change-Id: I0c4b7705176b0ae7eb4b06bf5a138757d6b16e9c
2018-01-16 11:52:20 +00:00
Paul Duffin
b36eb542a9 Replace legacy-test with android.test.base in bp files
The legacy-test target is deprecated and will be replaced by
android.test.base. This replaces a few usages of the legacy-test target
in Android.bp files with android.test.base.

Bug: 30188076
Test: make checkbuild
Change-Id: I3575f638114fe2a3b703e67837496346bde24472
2018-01-15 15:47:47 +00:00
Paul Duffin
4d5420f066 Merge "Remove junit classes from legacy-android-test" am: 4418418adb am: d724c112f3
am: 8e632576ed

Change-Id: I5b8f7a0c93e90741f0eba1d0761d2c26e8b24513
2018-01-13 21:36:33 +00:00
Paul Duffin
a88eb29f9e Remove junit classes from legacy-android-test
A mistake during the conversion of the legacy-android-test target from
Android.mk to Android.bp caused some junit classes to be accidentally
included in the legacy-android-test target. That caused some warnings
about duplicate classes to be output during the build.

The junit classes are being included as part of the static library
android.test.runner. This fixes that by adding a new
android.test.runner-minus-junit which excludes the junit classes
and then using that instead.

Test: make checkbuild
Change-Id: Icd00b38c64d3416a55c1055f9716ddb78ec278f8
2018-01-13 09:37:37 +00:00
Paul Duffin
e95a895ef4 Added new android.test.base targets
Renames ...-legacy-test-... targets related to stubs generation to
...-android-test-base-....

(cherry picked from commit 5c99382a19)

Bug: 30188076
Test: make checkbuild
Change-Id: I40b39c5250b7d990a903052c0b1ebd694242b5b3
Merged-Id: I54204733612d6d3f14dd8023973e993a5ddab51d
2018-01-12 16:31:08 +00:00
Paul Duffin
2141827700 Move legacy-test to test-base
Make it consistent with the test-mock and test-runner directories.
Also renames the files in api/ subdirectory.

(cherry picked from commit f779efd62c)

Bug: 30188076
Test: make checkbuild
Change-Id: Ied3621e6201d8717223fe1ccd4ea77d458126b25
Merged-In: If4f99a65fcca416ede5b3e63481398f0b451bcb7
2018-01-12 15:52:39 +00:00
Paul Duffin
a70f66cb5e Add android.test.legacy target
Adds a library that builds against the public API and so can be safely
statically included into applications to avoid them having to depend
on the android.test.base and android.test.runner runtime libraries.

Bug: 30188076
Test: make checkbuild
Change-Id: Iae7e3c64392e11035322092ed8e194740ba2d321
2018-01-09 14:38:43 +00:00
Paul Duffin
42cea8f5ad Remove unused target legacy.test.stubs
This target is no longer used so can be safely removed.

Bug: 30188076
Test: make checkbuild
Change-Id: Id15d6916c33647d56cb85bbc4cc926c89ff3d4bd
2018-01-06 11:51:43 +00:00
Paul Duffin
d8871e2dcc Add hostdex target for android.test.base
Bug: 30188076
Test: make dist
Change-Id: If9dc0f94df06fa3881b920e9f6688636a5addcf5
2017-12-15 13:52:59 +00:00
Colin Cross
2b7d71c7f8 Convert legacy-test, test-runner, and test-mock to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: I110f752d2fa94c44581f20d4f308d9d429da0517
2017-12-08 21:01:53 +00:00
Paul Duffin
1f090a8d66 Use prebuilt android.test.base.jar for app builds
Bug: 30188076
Test: make checkbuild
Change-Id: I1d7e705baf5728e7a034f3bd32746de3a1d3cd78
2017-12-06 12:43:28 +00:00
Paul Duffin
f90cbc6b14 Remove unused repackaged-legacy-test target
Bug: 30188076
Test: make checkbuild
Change-Id: I0858e706f3e7d55b98156af8a1c54b83d775c089
2017-11-29 14:34:54 +00:00
Paul Duffin
5c99382a19 Added new android.test.base targets
Renames ...-legacy-test-... targets related to stubs generation to
...-android-test-base-....

Bug: 30188076
Test: make checkbuild
Change-Id: I54204733612d6d3f14dd8023973e993a5ddab51d
2017-11-28 15:42:05 +00:00
Paul Duffin
f779efd62c Move legacy-test to test-base
Make it consistent with the test-mock and test-runner directories.
Also renames the files in api/ subdirectory.

Bug: 30188076
Test: make checkbuild
Change-Id: If4f99a65fcca416ede5b3e63481398f0b451bcb7
2017-11-28 12:03:53 +00:00