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

Commit 1f730081 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am c44989d6: Merge change 5350 into donut 

Merge commit 'c44989d6'

* commit 'c44989d6':
  move ui/Time.cpp to core/jni, since this is the only place it is used
parents 98c600eb c44989d6

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES:= \ 
	ActivityManager.cpp \

	AndroidRuntime.cpp \

	CursorWindow.cpp \

	Time.cpp \

	com_google_android_gles_jni_EGLImpl.cpp \

	com_google_android_gles_jni_GLImpl.cpp.arm \

	android_opengl_GLES10.cpp \

libs/ui/Time.cpp→core/jni/Time.cpp

+1 −1
Original line number Diff line number Diff line 
#include <utils/TimeUtils.h>

#include "TimeUtils.h"

#include <stdio.h>

#include <cutils/tztime.h>

include/utils/TimeUtils.h→core/jni/TimeUtils.h

+0 −0

File moved.

View file

core/jni/android_text_format_Time.cpp

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

#include "utils/misc.h"

#include "android_runtime/AndroidRuntime.h"

#include <utils/TimeUtils.h>

#include "TimeUtils.h"

#include <nativehelper/JNIHelp.h>

#include <cutils/tztime.h>

libs/ui/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ LOCAL_SRC_FILES:= \ 
	Region.cpp \

	Surface.cpp \

	SurfaceComposerClient.cpp \

	SurfaceFlingerSynchro.cpp \

	Time.cpp

	SurfaceFlingerSynchro.cpp 



LOCAL_SHARED_LIBRARIES := \

	libcorecg \