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

Commit ad479709 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Split internal common utils library to 1.x and 2.x."

parents 46a874dc 8e67a33f

services/core/jni/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ cc_defaults { 
    ],



    static_libs: [

        "android.hardware.broadcastradio@common-utils-lib",

        "android.hardware.broadcastradio@common-utils-1x-lib",

        "libscrypt_static",

    ],

}

services/core/jni/BroadcastRadio/BroadcastRadioService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h>

#include <android/hardware/broadcastradio/1.2/IBroadcastRadioFactory.h>

#include <android/hidl/manager/1.0/IServiceManager.h>

#include <broadcastradio-utils/Utils.h>

#include <broadcastradio-utils-1x/Utils.h>

#include <core_jni_helpers.h>

#include <hidl/ServiceManagement.h>

#include <nativehelper/JNIHelp.h>

services/core/jni/BroadcastRadio/Tuner.cpp

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <android/hardware/broadcastradio/1.2/IBroadcastRadioFactory.h>

#include <binder/IPCThreadState.h>

#include <broadcastradio-utils/Utils.h>

#include <broadcastradio-utils-1x/Utils.h>

#include <core_jni_helpers.h>

#include <media/AudioSystem.h>

#include <nativehelper/JNIHelp.h>

services/core/jni/BroadcastRadio/TunerCallback.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "Tuner.h"

#include "convert.h"



#include <broadcastradio-utils/Utils.h>

#include <broadcastradio-utils-1x/Utils.h>

#include <core_jni_helpers.h>

#include <nativehelper/JNIHelp.h>

#include <utils/Log.h>

services/core/jni/BroadcastRadio/convert.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include "regions.h"



#include <broadcastradio-utils/Utils.h>

#include <broadcastradio-utils-1x/Utils.h>

#include <core_jni_helpers.h>

#include <nativehelper/JNIHelp.h>

#include <utils/Log.h>