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

Commit 1bba264f authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "FastPath: Clean up state queue instantiations" into udc-dev-plus-aosp am: 8e3c2d8b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23459914



Change-Id: I5863e883b9ea107e5fcf2453462d8c34ab487f5c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70bf6c7f 8e3c2d8b

services/audioflinger/fastpath/Android.bp

+0 −3
Original line number Original line Diff line number Diff line
@@ -154,9 +154,6 @@ cc_library_shared { 
        "libmedia_headers",

        "libmedia_headers",

    ],

    ],





    cflags: [

        "-DSTATE_QUEUE_INSTANTIATIONS=\"StateQueueInstantiations.cpp\"",

    ],

    sanitize: {

    sanitize: {

        integer_overflow: true,

        integer_overflow: true,

    },

    },

services/audioflinger/fastpath/StateQueue.cpp

+11 −6
Original line number Original line Diff line number Diff line
@@ -187,9 +187,14 @@ template<typename T> bool StateQueue<T>::push(StateQueue<T>::block_t block) 




}   // namespace android

}   // namespace android





// Hack to avoid explicit template instantiation of

// Instantiate StateQueue template for the types we need.

// template class StateQueue<FastCaptureState>;

// This needs to be done in the same translation unit as the template

// template class StateQueue<FastMixerState>;

// method definitions above.

#ifdef STATE_QUEUE_INSTANTIATIONS



#include STATE_QUEUE_INSTANTIATIONS  // NOLINT(bugprone-suspicious-include)

#include "FastCaptureState.h"

#endif
 
#include "FastMixerState.h"



namespace android {

template class StateQueue<FastCaptureState>;

template class StateQueue<FastMixerState>;

}   // namespace android

services/audioflinger/fastpath/StateQueueInstantiations.cpp

deleted100644 → 0
+0 −29
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "Configuration.h"

#include "FastMixerState.h"

#include "FastCaptureState.h"

#include "StateQueue.h"



// FIXME hack for gcc



namespace android {



template class StateQueue<FastMixerState>;      // typedef FastMixerStateQueue

template class StateQueue<FastCaptureState>;    // typedef FastCaptureStateQueue



}