Put system stub in 'system_N' directory when finalizing.
am: 934777cff0
Change-Id: I58baec3ae69b6b84486ba75701831d7acb004068
diff --git a/Android.bp b/Android.bp
index a47266b..7447b41 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1 +1,16 @@
subdirs=["tools"]
+
+filegroup {
+ name: "api-version-xml",
+ srcs: [
+ "api/*.xml",
+ "api/*.txt",
+ ],
+}
+
+filegroup {
+ name: "current-support-api",
+ srcs: [
+ "current/support-api.txt",
+ ],
+}
diff --git a/current/Android.bp b/current/Android.bp
new file mode 100644
index 0000000..25f87b4
--- /dev/null
+++ b/current/Android.bp
@@ -0,0 +1,19 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+java_import {
+ name: "android.test.mock.stubs",
+ jars: ["optional/android.test.mock.jar"],
+ sdk_version: "current",
+}
diff --git a/current/Android.mk b/current/Android.mk
index 63d9087..8630e65 100644
--- a/current/Android.mk
+++ b/current/Android.mk
@@ -47,7 +47,6 @@
# as the target name does not match the JAR name.
prebuilts += \
android.test.base.stubs:optional/android.test.base.jar \
- android.test.mock.stubs:optional/android.test.mock.jar \
android.test.runner.stubs:optional/android.test.runner.jar
$(foreach p,$(prebuilts),\
diff --git a/system_current/Android.bp b/system_current/Android.bp
new file mode 100644
index 0000000..eb96140
--- /dev/null
+++ b/system_current/Android.bp
@@ -0,0 +1,19 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+java_import {
+ name: "android.test.mock.stubs-system",
+ jars: ["optional/android.test.mock.jar"],
+ sdk_version: "current",
+}
diff --git a/system_current/Android.mk b/system_current/Android.mk
deleted file mode 100644
index c907a03..0000000
--- a/system_current/Android.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-#########################################
-# The prebuilt support libraries.
-
-include $(CLEAR_VARS)
-
-# For apps (unbundled) build, replace the typical
-# make target artifacts with prebuilts.
-ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
-
- # Set up prebuilts for optional libraries. Need to specify them explicitly
- # as the target name does not match the JAR name.
- prebuilts += \
- android.test.mock.stubs-system:optional/android.test.mock.jar \
-
- define define-prebuilt
- $(eval tw := $(subst :, ,$(strip $(1)))) \
- $(eval include $(CLEAR_VARS)) \
- $(eval LOCAL_MODULE := $(word 1,$(tw))) \
- $(eval LOCAL_MODULE_TAGS := optional) \
- $(eval LOCAL_MODULE_CLASS := JAVA_LIBRARIES) \
- $(eval LOCAL_SRC_FILES := $(word 2,$(tw))) \
- $(eval LOCAL_UNINSTALLABLE_MODULE := true) \
- $(eval LOCAL_SDK_VERSION := current) \
- $(eval include $(BUILD_PREBUILT))
- endef
-
- $(foreach p,$(prebuilts),\
- $(call define-prebuilt,$(p)))
-
- prebuilts :=
-endif # TARGET_BUILD_APPS not empty or TARGET_BUILD_PDK set to True