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

Commit c893b460 authored by Jiyong Park's avatar Jiyong Park
Browse files

Replace framework.jar with framework-minus-apex.jar 

framework.jar is now a build-time only library which has private symbols
from framework-minus-apex.jar and public symbols from APEXes. Instead of
framework.jar, framework-minus-apex.jar is installed to the device.

framework-minus-apex is installed as framework.jar because the name is
pretty widespread throughout Android. Keeping the original file name for
the backwards compatibility.

Bug: 139391334
Test: m, inspect the build system.img and check that
system/framework/framework.jar exists
Merged-In: Ia12d5984b011a54bd8ef708d0f552298a6ddec8a

(cherry picked from commit 617a16478b0f5875084e339553b7b96f3a292e03)

Change-Id: I30d5c789c1d67cac7dfe6339f244e66af5114767
parent fde6b837

Android.bp

+24 −1
Original line number Diff line number Diff line
@@ -374,15 +374,38 @@ filegroup { 
}



java_library {

    name: "framework",

    name: "framework-minus-apex",

    defaults: ["framework-defaults"],

    srcs: [":framework-non-updatable-sources"],

    installable: true,

    javac_shard_size: 150,

    required: [

        "framework-platform-compat-config",

        "libcore-platform-compat-config",

        "services-platform-compat-config",

    ],

    // For backwards compatibility.

    stem: "framework",

}



// This "framework" module is NOT installed to the device. It's

// "framework-minus-apex" that gets installed to the device. Note that

// the filename is still framework.jar (via the stem property) for

// compatibility reason. The purpose of this module is to provide

// framework APIs (both public and private) for bundled apps.

// "framework-minus-apex" can't be used for the purpose because 1)

// many apps have already hardcoded the name "framework" and

// 2) it lacks API symbols from updatable modules - as it's clear from

// its suffix "-minus-apex".

java_library {

    name: "framework",

    defaults: ["framework-aidl-export-defaults"],

    installable: false, // this lib is a build-only library

    static_libs: [

        "framework-minus-apex",

        // TODO(jiyong): add stubs for APEXes here

    ],

    sdk_version: "core_platform",

}



java_library {