OSDN Git Service

Fix SettingsRoboTests build error with OpenJDK 9
authorVictor Chang <vichang@google.com>
Mon, 5 Mar 2018 16:13:33 +0000 (16:13 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 5 Mar 2018 22:14:23 +0000 (22:14 +0000)
commit5ae1758d47dc706a8c1c66829df416ec3e236df7
treec3b5e671c5b60893e9077005638784f271f23645
parentb98d48c82ab2691ca0740be61b93d7d39b4fd933
Fix SettingsRoboTests build error with OpenJDK 9

- CL http://ag/3671365 broke git_pi-release/marlin-userdebug-jdk9
  when building "m checkbuild". It shouldn't break the image build

Test: m SettingsRoboTests
ROBOTEST_FILTER=com.android.settings.datetime.timezone
EXPERIMENTAL_USE_OPENJDK9=true USE_R8=true
Change-Id: I161c0350cff55bd13ba4a6c63df4e4e9bc4b1a5f
(cherry picked from commit e10875210adef2949aa4f9b56c40fb6d81b0f222)
tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
tests/robotests/src/libcore/util/CountryTimeZones.java [deleted file]
tests/robotests/src/libcore/util/CountryZonesFinder.java [deleted file]