commit 2488204386d0c6810e2ab921c6ed1517e6c7436a
author Neil Fuller <nfuller@google.com> Fri Jul 28 14:56:36 2017 +0100
committer Neil Fuller <nfuller@google.com> Mon Jul 31 15:58:17 2017 +0100
tree 828567b0e193fddb7c83c29c383e8edae6bbf0ef
parent 4cb562a48ec968a87018d1157eb0697ea87f44de

Make time zone data app code unbundleable

Remove references to internal classes and depend on system stubs.

Bug: 64139059
Test: Ran internal xTS tests
Change-Id: I2430e7ce23769a7f60e4d8202b4f6320b52cc1ab

Android.mk

diff --git a/Android.mk b/Android.mk
index 36401e6..9597e0d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
 LOCAL_PROGUARD_FLAG_FILES := $(LOCAL_PATH)/proguard.cfg
-LOCAL_STATIC_JAVA_LIBRARIES := time_zone_distro
+LOCAL_STATIC_JAVA_LIBRARIES := time_zone_distro android-support-annotations
+LOCAL_SDK_VERSION := system_current
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))