From d3edb1b2a1ad919c62252aa7e2436306576e0168 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Fri, 20 Dec 2019 14:32:40 +0900
Subject: [PATCH] Move android_*_stubs_current modules to frameworks/base

frameworks/base/StubLibraries.bp is the place where the droidstubs and
java_library modules for the API stub libraries are defined.

Bug: N/A
Test: m

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: I407d0d939582841ffa651488bf76667ab7ce9c64
(cherry picked from commit f371ec46ec141a7ac778ac680e3c3b185d6646e3)
Change-Id: I407d0d939582841ffa651488bf76667ab7ce9c64
---
 build/Android.bp | 86 ------------------------------------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
deleted file mode 100644
index 7815f399d..000000000
--- a/build/Android.bp
+++ /dev/null
@@ -1,86 +0,0 @@
-// 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_defaults {
-    name: "framework-stubs-default",
-    errorprone: {
-        javacflags: [
-            "-XepDisableAllChecks",
-        ],
-    },
-    java_resources: [
-        ":notices-for-framework-stubs",
-    ],
-    sdk_version: "none",
-    system_modules: "none",
-    java_version: "1.8",
-    compile_dex: true,
-}
-
-java_library_static {
-    name: "android_stubs_current",
-    srcs: [
-        ":api-stubs-docs",
-    ],
-    libs: [
-        "stub-annotations",
-    ],
-    static_libs: [
-        "private-stub-annotations-jar",
-    ],
-    defaults: ["framework-stubs-default"],
-}
-
-java_system_modules {
-    name: "android_stubs_current_system_modules",
-    libs: ["android_stubs_current"],
-}
-
-java_library_static {
-    name: "android_system_stubs_current",
-    srcs: [
-        ":system-api-stubs-docs",
-    ],
-    libs: [
-        "stub-annotations",
-    ],
-    static_libs: [
-        "private-stub-annotations-jar",
-    ],
-    defaults: ["framework-stubs-default"],
-}
-
-java_system_modules {
-    name: "android_system_stubs_current_system_modules",
-    libs: ["android_system_stubs_current"],
-}
-
-java_library_static {
-    name: "android_test_stubs_current",
-    srcs: [
-        ":test-api-stubs-docs",
-    ],
-    libs: [
-        "stub-annotations",
-    ],
-    static_libs: [
-        "private-stub-annotations-jar",
-    ],
-    defaults: ["framework-stubs-default"],
-}
-
-java_system_modules {
-    name: "android_test_stubs_current_system_modules",
-    libs: ["android_test_stubs_current"],
-}