Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp

Browse Source 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8217f0ad136df63f9861bdb3e18b9d0ae8812214
Merged-In: I6d69fb418bac675bbb9e4ac25c3269dfa3029219
This commit is contained in:
Inseob Kim
2019-08-22 15:04:50 +09:00
parent 729bac82ff 5a8c6d97a5
commit f1ceee0166
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Android.bp
View File

@@ -102,10 +102,8 @@ framework_srcs = [
// etc. // etc.
"core/java/**/*.logtags", "core/java/**/*.logtags",
":apex-properties",
":framework-javastream-protos", ":framework-javastream-protos",
":framework-statslog-gen", ":framework-statslog-gen",
":platform-properties",
] ]
framework_aidl_local_include_dirs = [ framework_aidl_local_include_dirs = [
@@ -208,6 +206,9 @@ java_defaults {
"android.hardware.vibrator-V1.3-java", "android.hardware.vibrator-V1.3-java",
"android.hardware.wifi-V1.0-java-constants", "android.hardware.wifi-V1.0-java-constants",
"devicepolicyprotosnano", "devicepolicyprotosnano",
"com.android.sysprop.apex",
"PlatformProperties",
], ],
required: [ required: [