From d7647c1b6685dbf03ff096fd73424163f2468e4e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 10 Jul 2018 14:24:31 -0700
Subject: [PATCH] Mark installable jars with installable: true

Most jars don't need to be installed on the device.  Instead of
using java_library and java_library_static to distinguish between
them make java_library and java_library_static identical and use
installable: true to identify the few jars that need to be dexed
and installed on the device.

Bug: 110885583
Test: m checkbuild
Change-Id: I19c0e723285c7088700f50567b9c2140289f9edf
---
 Android.bp    | 1 +
 vr/Android.bp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Android.bp b/Android.bp
index a0b08ab3234eb..b65c30ad643a7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -705,6 +705,7 @@ java_library {
 // specified on the build command line.
 java_library {
     name: "framework-oahl-backward-compatibility",
+    installable: true,
     srcs: [
         "core/java/android/content/pm/OrgApacheHttpLegacyUpdater.java",
     ],
diff --git a/vr/Android.bp b/vr/Android.bp
index b5904d6f35ab8..775ec968f59d2 100644
--- a/vr/Android.bp
+++ b/vr/Android.bp
@@ -26,6 +26,7 @@ cc_library_shared {
 // Java platform library for vr stuff.
 java_library {
     name: "com.google.vr.platform",
+    installable: true,
     owner: "google",
     required: [
         "libdvr_loader",