Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a12c0f50 authored by Colin Cross's avatar Colin Cross
Browse files

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: I579da7c1a712ec4fb49e288e7f3ab369cb75baf4
parent f40f0522

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


java_library {

    name: "framework",

    installable: true,



    srcs: [

        // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS
@@ -672,6 +673,7 @@ gensrcs { 
// ============================================================

java_library {

    name: "ext",

    installable: true,

    no_framework_libs: true,

    static_libs: [

        "libphonenumber-platform",

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
// ============================================================

java_library {

    name: "services",

    installable: true,



    dex_preopt: {

        app_image: true,

test-base/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
// Also contains the com.android.internal.util.Predicate[s] classes.

java_library {

    name: "android.test.base",

    installable: true,



    srcs: ["src/**/*.java"],
@@ -42,6 +43,7 @@ java_library { 
// Also contains the com.android.internal.util.Predicate[s] classes.

java_library {

    name: "legacy-test",

    installable: true,



    sdk_version: "current",

    static_libs: ["android.test.base"],

test-mock/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
// ===================================

java_library {

    name: "android.test.mock",

    installable: true,



    // Needs to be consistent with the repackaged version of this make target.

    java_version: "1.8",

test-runner/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
// =====================================

java_library {

    name: "android.test.runner",

    installable: true,



    // Needs to be consistent with the repackaged version of this make target.

    java_version: "1.8",