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

Commit 4992cdab authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Create frameworks/base/telephony/common for common non-mainline telephony code." 

am: b14b8bf4

Change-Id: Ifa50ddcb0925525c2f82d35bf3e1e976eb302c44
parents a321a944 b14b8bf4

Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -182,6 +182,14 @@ filegroup { 
    path: "telephony/java",

}



filegroup {

    name: "framework-telephony-common-sources",

    srcs: [

        "telephony/common/**/*.java",

    ],

    path: "telephony/common",

}



filegroup {

    name: "framework-wifi-sources",

    srcs: [
@@ -210,6 +218,7 @@ filegroup { 
        ":framework-rs-sources",

        ":framework-sax-sources",

        ":framework-telecomm-sources",

        ":framework-telephony-common-sources",

        ":framework-telephony-sources",

        ":framework-wifi-sources",

        ":PacProcessor-aidl-sources",
@@ -854,6 +863,7 @@ frameworks_base_subdirs = [ 
    "opengl/java",

    "sax/java",

    "telecomm/java",

    "telephony/common",

    "telephony/java",

    "wifi/java",

    "lowpan/java",

CleanSpec.mk

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

$(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)

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

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

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