Merge "Add genrule to find API file Metalava used to generate annotations"
diff --git a/28/public/api/com.android.location.provider-removed.txt b/28/public/api/com.android.location.provider-removed.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/public/api/com.android.location.provider-removed.txt
diff --git a/28/public/api/com.android.location.provider.txt b/28/public/api/com.android.location.provider.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/public/api/com.android.location.provider.txt
diff --git a/28/system/api/com.android.location.provider-removed.txt b/28/system/api/com.android.location.provider-removed.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/system/api/com.android.location.provider-removed.txt
diff --git a/28/system/api/com.android.location.provider.txt b/28/system/api/com.android.location.provider.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/system/api/com.android.location.provider.txt
diff --git a/28/test/api/com.android.location.provider-removed.txt b/28/test/api/com.android.location.provider-removed.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/test/api/com.android.location.provider-removed.txt
diff --git a/28/test/api/com.android.location.provider.txt b/28/test/api/com.android.location.provider.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/28/test/api/com.android.location.provider.txt
diff --git a/Android.mk b/Android.mk
index d5a9240..9073ac3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,29 +16,4 @@
LOCAL_PATH := $(call my-dir)
-# Declares a single sdk module. These targets are referenced by the core build system.
-# $(1): sdk version (e.g. 23, current)
-# $(2): api level (e.g. public, system)
-# $(3): stub jar file path
-define declare-sdk-prebuilt
-include $$(CLEAR_VARS)
-# Format: sdk_<api>_<sdk_version>_<stub_name>
-LOCAL_MODULE := sdk_$(2)_$(1)_$(notdir $(basename $(3)))
-LOCAL_PREBUILT_MODULE_FILE := $(3)
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_SUFFIX := $$(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_BUILT_MODULE_STEM := $$(LOCAL_MODULE)$$(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_MIN_SDK_VERSION := $(if $(call math_is_number,$(strip $(1))),$(1),$$(PLATFORM_JACK_MIN_SDK_VERSION))
-LOCAL_UNINSTALLABLE_MODULE := true
-# TODO(hansson): change to $(1) after migration is done.
-LOCAL_SDK_VERSION := current
-include $$(BUILD_PREBUILT)
-endef
-
-$(foreach version,$(patsubst $(LOCAL_PATH)/%/public/android.jar,%,$(wildcard $(LOCAL_PATH)/*/public/android.jar)),\
- $(foreach api_level,core public system,\
- $(foreach jar_file, $(wildcard $(LOCAL_PATH)/$(version)/$(api_level)/*.jar),\
- $(eval \
- $(call declare-sdk-prebuilt,$(version),$(api_level),$(jar_file))))))
-
include $(call all-makefiles-under,$(LOCAL_PATH))
