commit 990aa3f60c8d3651f568a50504165ac131535fc4
author Greg Hartman <ghartman@google.com> Wed Apr 11 18:21:55 2018 -0700
committer Greg Hartman <ghartman@google.com> Thu Apr 12 04:50:22 2018 +0000
tree abaaf8726ca73ce79f4aa41f9e13c79d8e17756f
parent cd11f199cb79c5a069170f8c83324f4d9d5a6b85

Reconciliation for the tests

BUG: 76090743
Test: Local build
Change-Id: I3648b91184c60d17f5a39b15c87e03e1e905f790
(cherry picked from commit 6e1bcb0f5ca625340529bb6dba938a47bf60ad81)

tests/ril/Android.mk

diff --git a/tests/ril/Android.mk b/tests/ril/Android.mk
index a0329fa..178e916 100644
--- a/tests/ril/Android.mk
+++ b/tests/ril/Android.mk
@@ -25,7 +25,11 @@
 LOCAL_PACKAGE_NAME := CuttlefishRilTests
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
+ifeq (0, $(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?))
 LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+else
+LOCAL_JAVA_LIBRARIES := android.test.runner
+endif
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test espresso-core
 
 LOCAL_STATIC_JAVA_LIBRARIES+=platform-test-annotations

tests/wifi/Android.mk

diff --git a/tests/wifi/Android.mk b/tests/wifi/Android.mk
index 430ff47..50ba909 100644
--- a/tests/wifi/Android.mk
+++ b/tests/wifi/Android.mk
@@ -24,7 +24,11 @@
 LOCAL_PACKAGE_NAME := CuttlefishWifiTests
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
+ifeq (0, $(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?))
 LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+else
+LOCAL_JAVA_LIBRARIES := android.test.runner
+endif
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test platform-test-annotations
 
 include $(BUILD_PACKAGE)