Merge changes I5694a38e,I488f90aa,Ie9644dc8,I8d5b5b53,Ib8a0fa19 into qt-r1-dev

am: 2cfa02421b

Change-Id: I7e3a1c9041465f902afc0a1f8d4a60c289c5f384
This commit is contained in:
Selim Cinek
2019-06-19 19:22:23 -07:00
committed by android-build-merger
27 changed files with 650 additions and 143 deletions

View File

@@ -75,6 +75,7 @@ android_library {
"--extra-packages",
"com.android.keyguard",
],
kotlincflags: ["-Xjvm-default=enable"],
plugins: ["dagger2-compiler-2.19"],
}
@@ -129,6 +130,7 @@ android_library {
"telephony-common",
"android.test.base",
],
kotlincflags: ["-Xjvm-default=enable"],
aaptflags: [
"--extra-packages",
"com.android.keyguard:com.android.systemui",
@@ -156,6 +158,8 @@ android_app {
"telephony-common",
],
kotlincflags: ["-Xjvm-default=enable"],
dxflags: ["--multi-dex"],
aaptflags: [
"--extra-packages",
@@ -192,6 +196,8 @@ android_app {
"telephony-common",
],
kotlincflags: ["-Xjvm-default=enable"],
srcs: [
"legacy/recents/src/**/*.java",
"legacy/recents/src/**/I*.aidl",