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

Commit d1740f0f authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"

am: 2225a064

Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966
parents 3556fd53 2225a064
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@

#include <vector>

#include <android/log.h>
#include <log/log.h>
#include <utils/Log.h>

#include "jni.h"
+2 −1
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@
 */
#define LOG_TAG "OpenGLRenderer"

#include "android/log.h"

#include "jni.h"
#include "GraphicsJNI.h"
#include "core_jni_helpers.h"
#include "log/log.h"

#include "Animator.h"
#include "Interpolator.h"
+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@

#include <log/log_event_list.h>

#include <log/log.h>

#include "JNIHelp.h"
#include "core_jni_helpers.h"
#include "jni.h"
+2 −1
Original line number Diff line number Diff line
@@ -13,16 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#include "JankTracker.h"

#include <errno.h>
#include <inttypes.h>
#include <sys/mman.h>

#include <algorithm>
#include <cmath>
#include <cstdio>
#include <limits>
#include <sys/mman.h>

#include <cutils/ashmem.h>
#include <log/log.h>
+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@
#include <algorithm>
#include <cstdlib>

#include <log/log.h>
#include <cutils/compiler.h>
#include <cutils/properties.h>
#include <log/log.h>

namespace android {
namespace uirenderer {
Loading