From 8fcace4404a3fa75e671a32d4e0284d1ec327fc3 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Wed, 12 Jun 2019 13:47:18 +0100
Subject: Replace no_framework_libs: true with sdk_version: "core_platform"

(cherry picked from commit 7954524e3cc618830f0bf7b23687bf222ecd285b)

Bug: 134566750
Test: m
Change-Id: I0260942108a13cc5e9bed1d6005abfb8daffe0ac
Exempt-From-Owner-Approval: minor build change
---
 Android.bp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index fad4ef1d260e..80322de7fcf4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -741,7 +741,7 @@ java_defaults {
         "core/java/android/content/pm/AndroidTestBaseUpdater.java",
     ],
 
-    no_framework_libs: true,
+    sdk_version: "core_platform",
     libs: [
         "ext",
         "updatable_media_stubs",
@@ -945,7 +945,7 @@ filegroup {
 java_library {
     name: "ext",
     installable: true,
-    no_framework_libs: true,
+    sdk_version: "core_platform",
     static_libs: [
         "libphonenumber-platform",
         "nist-sip",
@@ -1169,7 +1169,7 @@ optional_subdirs = [
 // updated to use hwbinder.stubs.
 java_library {
     name: "hwbinder",
-    no_framework_libs: true,
+    sdk_version: "core_platform",
 
     srcs: [
         "core/java/android/os/HidlSupport.java",
@@ -1704,7 +1704,7 @@ droidstubs {
         "core/java/android/util/AndroidException.java",
     ],
     installable: false,
-    no_framework_libs: true,
+    sdk_version: "core_platform",
     annotations_enabled: true,
     previous_api: ":last-released-public-api",
     merge_annotations_dirs: [
-- 
cgit v1.2.3-59-g8ed1b