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

Commit 2d5486a0 authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Merge kwd to master"

parents 1113e381 273c22cb

core/pdk_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \ 
	target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \

	target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates \

	target/common/obj/JAVA_LIBRARIES/voip-common_intermediates \

	target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \

	target/common/obj/JAVA_LIBRARIES/mms-common_intermediates \

	target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \

	target/common/obj/JAVA_LIBRARIES/android-common_intermediates \

target/product/core_minimal.mk

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ PRODUCT_PACKAGES += \ 
    framework-res \

    idmap \

    installd \

    ims-common \

    ip \

    ip-up-vpn \

    ip6tables \
@@ -83,6 +84,7 @@ PRODUCT_BOOT_JARS := \ 
    framework2 \

    telephony-common \

    voip-common \

    ims-common \

    mms-common \

    android.policy \

    services \