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

am: f1ceee0166 Change-Id: If4355c580a8cd85fae95fd47510ca626f9c41bac
2019-08-23 20:10:05 -07:00
parent e69976f523 f1ceee0166
commit 0c859fa482
1 changed files with 3 additions and 2 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -102,10 +102,8 @@ framework_srcs = [

    // etc.
    "core/java/**/*.logtags",
-    ":apex-properties",
    ":framework-javastream-protos",
    ":framework-statslog-gen",
-    ":platform-properties",
 ]

 framework_aidl_local_include_dirs = [
@@ -208,6 +206,9 @@ java_defaults {
        "android.hardware.vibrator-V1.3-java",
        "android.hardware.wifi-V1.0-java-constants",
        "devicepolicyprotosnano",
+
+        "com.android.sysprop.apex",
+        "PlatformProperties",
    ],

    required: [