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

Commit f1ceee01 authored by Inseob Kim's avatar Inseob Kim
Browse files

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

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8217f0ad136df63f9861bdb3e18b9d0ae8812214
Merged-In: I6d69fb418bac675bbb9e4ac25c3269dfa3029219
parents 729bac82 5a8c6d97

Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -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: [