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

Commit d04028ce authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Rename framework and service jars"

parents e0ad70ff 97369f8d

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DefaultContainerSer 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/ext.jar)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/google/android/mms)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*-service.jar)

# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************

apex/appsearch/service/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.

java_library {

  name: "appsearch-service",

  name: "service-appsearch",

  installable: true,

  srcs: [

    "java/**/*.java",

apex/blobstore/service/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
// limitations under the License.



java_library {

    name: "blobstore-service",

    name: "service-blobstore",

    installable: true,



    srcs: [

apex/jobscheduler/README_js-mainline.md

+3 −3
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ 


## Current structure



- JS service side classes are put in `jobscheduler-service.jar`.

- JS service side classes are put in `service-jobscheduler.jar`.

It's *not* included in services.jar, and instead it's put in the system server classpath,

which currently looks like the following:

`SYSTEMSERVERCLASSPATH=/system/framework/services.jar:/system/framework/ethernet-service.jar:/system/framework/com.android.location.provider.jar:/system/framework/jobscheduler-service.jar`

`SYSTEMSERVERCLASSPATH=/system/framework/services.jar:/system/framework/ethernet-service.jar:/system/framework/com.android.location.provider.jar:/system/framework/service-jobscheduler.jar`



  `SYSTEMSERVERCLASSPATH` is generated from `PRODUCT_SYSTEM_SERVER_JARS`.



- JS framework side classes are put in `jobscheduler-framework.jar`,

- JS framework side classes are put in `framework-jobscheduler.jar`,

and the rest of the framework code is put in `framework-minus-apex.jar`,

as of http://ag/9145619.

apex/jobscheduler/framework/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ filegroup { 
}



java_library {

    name: "jobscheduler-framework",

    name: "framework-jobscheduler",

    installable: false,

    compile_dex: true,

    sdk_version: "core_platform",