Fix CtsIcuTestCases standard and error prone builds
Change 92c4c226b352cf6724327f449f524c3803a46f33 fixed a build
problem when using error prone but unfortunately broke the
standard build by removing the cts-core-test-runner from being
statically embedded in CtsIcuTestCases.apk so it could not
actually be run. This change fixes both.
It reverts the original change and changes the build so that
cts-core-test-runner is built using BUILD_STATIC_JAVA_LIBRARY
instead of BUILD_JAVA_LIBRARY.
Bug: 27723540
Test: cts-tradefed run cts -m CtsIcuTestCases
(cherry picked from commit aff3e8ce89b80ebf3d70e4957ee2c28a3748da1e)
Change-Id: I00dd92554d566144a962af19ac427317227e327f
1 file changed