7b3db39aa4
On modern versions of Android running in AOT mode FloatMath is slower than Math. Calls to Math.sqrt(), etc. are replaced by intrinsics which can be as small as a single CPU opcode. When running in interpreted mode the new implementation is unfortunately slower, but I'm judging this acceptable and likely to be improved over time. This change saves a small amount of native code. Example timings: Mako AOSP AOT: Method: Original / New / Direct call to Math ceil: 596ns / 146.ns / 111ns sqrt: 694ns / 56ns / 25ns Mako AOSP interpreted: Method: Original / New / Direct call to Math ceil: 1900ns / 2307ns / 1485ns sqrt: 1998ns / 2603ns / 1788ns Other calls Mako AOT: Method: Original / New cos: 635ns / 270ns exp: 566ns / 324ns floor: 604ns / 150ns hypot: 631ns / 232ns pow: 936ns / 643ns sin: 641ns / 299ns The advice to use Math directly, in preference to FloatMath, is still good. FloatMath will be deprecated separately. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
232 lines
6.7 KiB
Makefile
232 lines
6.7 KiB
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
|
|
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA
|
|
LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL
|
|
LOCAL_CFLAGS += -U__APPLE__
|
|
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast
|
|
LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
|
|
LOCAL_CPPFLAGS += -Wno-conversion-null
|
|
|
|
ifeq ($(TARGET_ARCH), arm)
|
|
LOCAL_CFLAGS += -DPACKED="__attribute__ ((packed))"
|
|
else
|
|
LOCAL_CFLAGS += -DPACKED=""
|
|
endif
|
|
|
|
ifeq ($(USE_OPENGL_RENDERER),true)
|
|
LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER
|
|
endif
|
|
|
|
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
|
|
|
|
LOCAL_SRC_FILES:= \
|
|
AndroidRuntime.cpp \
|
|
com_android_internal_content_NativeLibraryHelper.cpp \
|
|
com_google_android_gles_jni_EGLImpl.cpp \
|
|
com_google_android_gles_jni_GLImpl.cpp.arm \
|
|
android_app_NativeActivity.cpp \
|
|
android_opengl_EGL14.cpp \
|
|
android_opengl_EGLExt.cpp \
|
|
android_opengl_GLES10.cpp \
|
|
android_opengl_GLES10Ext.cpp \
|
|
android_opengl_GLES11.cpp \
|
|
android_opengl_GLES11Ext.cpp \
|
|
android_opengl_GLES20.cpp \
|
|
android_opengl_GLES30.cpp \
|
|
android_database_CursorWindow.cpp \
|
|
android_database_SQLiteCommon.cpp \
|
|
android_database_SQLiteConnection.cpp \
|
|
android_database_SQLiteGlobal.cpp \
|
|
android_database_SQLiteDebug.cpp \
|
|
android_emoji_EmojiFactory.cpp \
|
|
android_view_DisplayEventReceiver.cpp \
|
|
android_view_Surface.cpp \
|
|
android_view_SurfaceControl.cpp \
|
|
android_view_SurfaceSession.cpp \
|
|
android_view_TextureView.cpp \
|
|
android_view_InputChannel.cpp \
|
|
android_view_InputDevice.cpp \
|
|
android_view_InputEventReceiver.cpp \
|
|
android_view_InputEventSender.cpp \
|
|
android_view_InputQueue.cpp \
|
|
android_view_KeyEvent.cpp \
|
|
android_view_KeyCharacterMap.cpp \
|
|
android_view_HardwareRenderer.cpp \
|
|
android_view_GraphicBuffer.cpp \
|
|
android_view_GLES20DisplayList.cpp \
|
|
android_view_GLES20Canvas.cpp \
|
|
android_view_MotionEvent.cpp \
|
|
android_view_PointerIcon.cpp \
|
|
android_view_VelocityTracker.cpp \
|
|
android_text_AndroidCharacter.cpp \
|
|
android_text_AndroidBidi.cpp \
|
|
android_os_Debug.cpp \
|
|
android_os_MemoryFile.cpp \
|
|
android_os_MessageQueue.cpp \
|
|
android_os_Parcel.cpp \
|
|
android_os_SELinux.cpp \
|
|
android_os_SystemClock.cpp \
|
|
android_os_SystemProperties.cpp \
|
|
android_os_Trace.cpp \
|
|
android_os_UEventObserver.cpp \
|
|
android_net_LocalSocketImpl.cpp \
|
|
android_net_NetUtils.cpp \
|
|
android_net_TrafficStats.cpp \
|
|
android_net_wifi_WifiNative.cpp \
|
|
android_nio_utils.cpp \
|
|
android_util_AssetManager.cpp \
|
|
android_util_Binder.cpp \
|
|
android_util_EventLog.cpp \
|
|
android_util_Log.cpp \
|
|
android_util_Process.cpp \
|
|
android_util_StringBlock.cpp \
|
|
android_util_XmlBlock.cpp \
|
|
android/graphics/AutoDecodeCancel.cpp \
|
|
android/graphics/Bitmap.cpp \
|
|
android/graphics/BitmapFactory.cpp \
|
|
android/graphics/Camera.cpp \
|
|
android/graphics/Canvas.cpp \
|
|
android/graphics/ColorFilter.cpp \
|
|
android/graphics/DrawFilter.cpp \
|
|
android/graphics/CreateJavaOutputStreamAdaptor.cpp \
|
|
android/graphics/Graphics.cpp \
|
|
android/graphics/HarfBuzzNGFaceSkia.cpp \
|
|
android/graphics/Interpolator.cpp \
|
|
android/graphics/LayerRasterizer.cpp \
|
|
android/graphics/MaskFilter.cpp \
|
|
android/graphics/Matrix.cpp \
|
|
android/graphics/Movie.cpp \
|
|
android/graphics/NinePatch.cpp \
|
|
android/graphics/NinePatchImpl.cpp \
|
|
android/graphics/NinePatchPeeker.cpp \
|
|
android/graphics/Paint.cpp \
|
|
android/graphics/Path.cpp \
|
|
android/graphics/PathMeasure.cpp \
|
|
android/graphics/PathEffect.cpp \
|
|
android/graphics/Picture.cpp \
|
|
android/graphics/PorterDuff.cpp \
|
|
android/graphics/BitmapRegionDecoder.cpp \
|
|
android/graphics/Rasterizer.cpp \
|
|
android/graphics/Region.cpp \
|
|
android/graphics/Shader.cpp \
|
|
android/graphics/SurfaceTexture.cpp \
|
|
android/graphics/TextLayout.cpp \
|
|
android/graphics/TextLayoutCache.cpp \
|
|
android/graphics/Typeface.cpp \
|
|
android/graphics/Utils.cpp \
|
|
android/graphics/Xfermode.cpp \
|
|
android/graphics/YuvToJpegEncoder.cpp \
|
|
android/graphics/pdf/PdfDocument.cpp \
|
|
android_media_AudioRecord.cpp \
|
|
android_media_AudioSystem.cpp \
|
|
android_media_AudioTrack.cpp \
|
|
android_media_JetPlayer.cpp \
|
|
android_media_RemoteDisplay.cpp \
|
|
android_media_ToneGenerator.cpp \
|
|
android_hardware_Camera.cpp \
|
|
android_hardware_camera2_CameraMetadata.cpp \
|
|
android_hardware_SensorManager.cpp \
|
|
android_hardware_SerialPort.cpp \
|
|
android_hardware_UsbDevice.cpp \
|
|
android_hardware_UsbDeviceConnection.cpp \
|
|
android_hardware_UsbRequest.cpp \
|
|
android_util_FileObserver.cpp \
|
|
android/opengl/poly_clip.cpp.arm \
|
|
android/opengl/util.cpp.arm \
|
|
android_server_NetworkManagementSocketTagger.cpp \
|
|
android_server_Watchdog.cpp \
|
|
android_ddm_DdmHandleNativeHeap.cpp \
|
|
com_android_internal_os_ZygoteInit.cpp \
|
|
android_backup_BackupDataInput.cpp \
|
|
android_backup_BackupDataOutput.cpp \
|
|
android_backup_FileBackupHelperBase.cpp \
|
|
android_backup_BackupHelperDispatcher.cpp \
|
|
android_app_backup_FullBackup.cpp \
|
|
android_content_res_ObbScanner.cpp \
|
|
android_content_res_Configuration.cpp \
|
|
android_animation_PropertyValuesHolder.cpp \
|
|
com_android_internal_net_NetworkStatsFactory.cpp \
|
|
com_android_internal_os_Zygote.cpp
|
|
|
|
LOCAL_C_INCLUDES += \
|
|
$(JNI_H_INCLUDE) \
|
|
$(LOCAL_PATH)/android/graphics \
|
|
$(LOCAL_PATH)/../../libs/hwui \
|
|
$(LOCAL_PATH)/../../../native/opengl/libs \
|
|
$(call include-path-for, bluedroid) \
|
|
$(call include-path-for, libhardware)/hardware \
|
|
$(call include-path-for, libhardware_legacy)/hardware_legacy \
|
|
$(TOP)/frameworks/av/include \
|
|
$(TOP)/system/media/camera/include \
|
|
external/icu/icu4c/source/common \
|
|
external/skia/src/core \
|
|
external/skia/src/pdf \
|
|
external/skia/src/images \
|
|
external/skia/include/utils \
|
|
external/sqlite/dist \
|
|
external/sqlite/android \
|
|
external/expat/lib \
|
|
external/openssl/include \
|
|
external/tremor/Tremor \
|
|
external/jpeg \
|
|
external/harfbuzz_ng/src \
|
|
external/zlib \
|
|
frameworks/opt/emoji \
|
|
libcore/include
|
|
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libmemtrack \
|
|
libandroidfw \
|
|
libexpat \
|
|
libnativehelper \
|
|
liblog \
|
|
libcutils \
|
|
libutils \
|
|
libbinder \
|
|
libnetutils \
|
|
libui \
|
|
libgui \
|
|
libinput \
|
|
libcamera_client \
|
|
libcamera_metadata \
|
|
libskia \
|
|
libsqlite \
|
|
libEGL \
|
|
libGLESv1_CM \
|
|
libGLESv2 \
|
|
libETC1 \
|
|
libhardware \
|
|
libhardware_legacy \
|
|
libselinux \
|
|
libsonivox \
|
|
libcrypto \
|
|
libssl \
|
|
libicuuc \
|
|
libicui18n \
|
|
libmedia \
|
|
libjpeg \
|
|
libusbhost \
|
|
libharfbuzz_ng \
|
|
libz \
|
|
libnativebridge
|
|
|
|
ifeq ($(USE_OPENGL_RENDERER),true)
|
|
LOCAL_SHARED_LIBRARIES += libhwui
|
|
endif
|
|
|
|
LOCAL_SHARED_LIBRARIES += \
|
|
libdl
|
|
|
|
# we need to access the private Bionic header
|
|
# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
|
|
LOCAL_C_INCLUDES += bionic/libc/private
|
|
|
|
LOCAL_MODULE:= libandroid_runtime
|
|
|
|
include external/stlport/libstlport.mk
|
|
include $(BUILD_SHARED_LIBRARY)
|
|
|
|
include $(call all-makefiles-under,$(LOCAL_PATH))
|