From 369bafac969a8f0f92eeee459d48bc979339cb58 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Wed, 8 Apr 2020 16:37:10 +0100
Subject: [PATCH] Use module_current to build module stubs

module_current is always built from sources, whereas the
other SDK jars are being transitioned to be composed of
a set of stubs. This avoids the dependency cycle of module
stubs depending on themselves.

Bug: 144149403
Test: m
Change-Id: I31c6d0fa958aa502131352716a9f950828b7829c
Merged-In: I31c6d0fa958aa502131352716a9f950828b7829c
(cherry picked from commit eb34cbee12039167dadcc6ae02ba1aad7b9a08b7)
---
 apex/Android.bp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apex/Android.bp b/apex/Android.bp
index 79ab3e4e7be96..1d147742b9933 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -136,7 +136,7 @@ stubs_defaults {
     name: "framework-module-stubs-defaults-publicapi",
     args: mainline_framework_stubs_args,
     installable: false,
-    sdk_version: "current",
+    sdk_version: "module_current",
     filter_packages: framework_packages_to_document,
     check_api: {
         current: {
@@ -151,7 +151,7 @@ stubs_defaults {
     args: mainline_framework_stubs_args + priv_apps,
     libs: ["framework-annotations-lib"],
     installable: false,
-    sdk_version: "system_current",
+    sdk_version: "module_current",
     filter_packages: framework_packages_to_document,
     check_api: {
         current: {