2009-03-03 19:31:44 -08:00
|
|
|
LOCAL_PATH:= $(call my-dir)
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
|
|
|
|
|
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__
|
|
|
|
|
|
|
|
|
|
ifeq ($(TARGET_ARCH), arm)
|
|
|
|
|
LOCAL_CFLAGS += -DPACKED="__attribute__ ((packed))"
|
|
|
|
|
else
|
|
|
|
|
LOCAL_CFLAGS += -DPACKED=""
|
|
|
|
|
endif
|
|
|
|
|
|
2009-06-19 13:31:12 -07:00
|
|
|
ifeq ($(WITH_JIT),true)
|
|
|
|
|
LOCAL_CFLAGS += -DWITH_JIT
|
|
|
|
|
endif
|
|
|
|
|
|
2009-03-03 19:31:44 -08:00
|
|
|
ifneq ($(USE_CUSTOM_RUNTIME_HEAP_MAX),)
|
|
|
|
|
LOCAL_CFLAGS += -DCUSTOM_RUNTIME_HEAP_MAX=$(USE_CUSTOM_RUNTIME_HEAP_MAX)
|
|
|
|
|
endif
|
|
|
|
|
|
2009-04-10 14:24:30 -07:00
|
|
|
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
|
|
|
|
|
|
2009-03-03 19:31:44 -08:00
|
|
|
LOCAL_SRC_FILES:= \
|
|
|
|
|
ActivityManager.cpp \
|
|
|
|
|
AndroidRuntime.cpp \
|
|
|
|
|
CursorWindow.cpp \
|
2009-06-24 23:12:06 -07:00
|
|
|
Time.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
com_google_android_gles_jni_EGLImpl.cpp \
|
|
|
|
|
com_google_android_gles_jni_GLImpl.cpp.arm \
|
2010-05-04 11:40:40 -07:00
|
|
|
android_app_NativeActivity.cpp \
|
Manually merge 129, 174, and 233 from donut
This adds a static OpenGL ES API.
Here are the three commit messages for the original changes:
Clean up trivial Eclipse warnings and fix whitespace.
Added @Override to overridden methods.
Removed unused imports.
Converted tabs to spaces.
Removed \r characters from end-of-lines.
Add .gitignore file to ignore the .class files that are
generated when the "gen" script is run.
This is the 2nd commit message:
Improve glgen
+ gen script is really a bash script rather than a sh script,
so declare that to be true. (For example, it uses pushd,
which is a part of bash, but not a part of sh. Not sure
how this worked until now. Possibly gen was only run in
environments where /bin/sh was really bash.
+ Check the results of the java compile of the code generator,
and abort the script if the compile fails.
+ Turn on the bash shell option that guards against using
uninitialized variables in the script.
+ Remove the generated class files.
Refactor JniCodeEmitter into two classes: a general-purpose
JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is
to use JniCodeEmitter as a base for emitting static OpenGL ES
bindings.
This is the 3rd commit message:
Add an Android-specific static OpenGL ES 1.1 Java API.
This change adds four new public classes that expose a static OpenGL ES 1.1 API:
android.opengl.GLES10
android.opengl.GLES10Ext
android.opengl.GLES11
android.opengl.GLES11Ext
Benefits:
+ The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
+ The static API is similar to the C API, which should make it easier to import C-based
example code.
+ The static API provides a clear path for adding new OpenGL ES 1.1 extensions
and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.
Example:
import static android.opengl.GLES10.*;
...
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.
Implementation details:
This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.
As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
2009-04-13 16:22:25 -07:00
|
|
|
android_opengl_GLES10.cpp \
|
|
|
|
|
android_opengl_GLES10Ext.cpp \
|
|
|
|
|
android_opengl_GLES11.cpp \
|
|
|
|
|
android_opengl_GLES11Ext.cpp \
|
2009-11-19 16:34:55 +08:00
|
|
|
android_opengl_GLES20.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_database_CursorWindow.cpp \
|
2009-10-20 15:16:35 -07:00
|
|
|
android_database_SQLiteCompiledSql.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_database_SQLiteDebug.cpp \
|
|
|
|
|
android_database_SQLiteDatabase.cpp \
|
|
|
|
|
android_database_SQLiteProgram.cpp \
|
|
|
|
|
android_database_SQLiteQuery.cpp \
|
|
|
|
|
android_database_SQLiteStatement.cpp \
|
2009-03-09 11:52:12 -07:00
|
|
|
android_emoji_EmojiFactory.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_view_Display.cpp \
|
|
|
|
|
android_view_Surface.cpp \
|
|
|
|
|
android_view_ViewRoot.cpp \
|
Native input dispatch rewrite work in progress.
The old dispatch mechanism has been left in place and continues to
be used by default for now. To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.
Includes part of the new input event NDK API. Some details TBD.
To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument. The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points. The ViewRoot then
provides the InputChannel to the InputQueue. Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue. This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.
There can be zero or more targets for any given input event. Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets). Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.
End-to-end event dispatch mostly works!
To do: event injection, rate limiting, ANRs, testing, optimization, etc.
Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
2010-04-22 18:58:52 -07:00
|
|
|
android_view_InputChannel.cpp \
|
|
|
|
|
android_view_InputQueue.cpp \
|
|
|
|
|
android_view_KeyEvent.cpp \
|
|
|
|
|
android_view_MotionEvent.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_text_AndroidCharacter.cpp \
|
2010-02-24 14:33:15 -08:00
|
|
|
android_text_AndroidBidi.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_text_KeyCharacterMap.cpp \
|
|
|
|
|
android_os_Debug.cpp \
|
|
|
|
|
android_os_FileUtils.cpp \
|
|
|
|
|
android_os_MemoryFile.cpp \
|
2010-05-06 12:07:10 -07:00
|
|
|
android_os_MessageQueue.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_os_ParcelFileDescriptor.cpp \
|
|
|
|
|
android_os_Power.cpp \
|
|
|
|
|
android_os_StatFs.cpp \
|
|
|
|
|
android_os_SystemClock.cpp \
|
|
|
|
|
android_os_SystemProperties.cpp \
|
|
|
|
|
android_os_UEventObserver.cpp \
|
|
|
|
|
android_net_LocalSocketImpl.cpp \
|
|
|
|
|
android_net_NetUtils.cpp \
|
2010-04-07 17:30:50 -07:00
|
|
|
android_net_TrafficStats.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_net_wifi_Wifi.cpp \
|
|
|
|
|
android_nio_utils.cpp \
|
|
|
|
|
android_pim_EventRecurrence.cpp \
|
|
|
|
|
android_text_format_Time.cpp \
|
|
|
|
|
android_security_Md5MessageDigest.cpp \
|
|
|
|
|
android_util_AssetManager.cpp \
|
|
|
|
|
android_util_Binder.cpp \
|
|
|
|
|
android_util_EventLog.cpp \
|
|
|
|
|
android_util_Log.cpp \
|
|
|
|
|
android_util_FloatMath.cpp \
|
|
|
|
|
android_util_Process.cpp \
|
|
|
|
|
android_util_StringBlock.cpp \
|
|
|
|
|
android_util_XmlBlock.cpp \
|
2010-07-19 16:59:51 +08:00
|
|
|
android/graphics/AutoDecodeCancel.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
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/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/Paint.cpp \
|
|
|
|
|
android/graphics/Path.cpp \
|
|
|
|
|
android/graphics/PathMeasure.cpp \
|
|
|
|
|
android/graphics/PathEffect.cpp \
|
|
|
|
|
android_graphics_PixelFormat.cpp \
|
|
|
|
|
android/graphics/Picture.cpp \
|
|
|
|
|
android/graphics/PorterDuff.cpp \
|
|
|
|
|
android/graphics/Rasterizer.cpp \
|
|
|
|
|
android/graphics/Region.cpp \
|
|
|
|
|
android/graphics/Shader.cpp \
|
|
|
|
|
android/graphics/Typeface.cpp \
|
2010-09-07 17:32:18 +08:00
|
|
|
android/graphics/Utils.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android/graphics/Xfermode.cpp \
|
2009-11-30 17:52:05 +08:00
|
|
|
android/graphics/YuvToJpegEncoder.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_media_AudioRecord.cpp \
|
|
|
|
|
android_media_AudioSystem.cpp \
|
|
|
|
|
android_media_AudioTrack.cpp \
|
|
|
|
|
android_media_JetPlayer.cpp \
|
|
|
|
|
android_media_ToneGenerator.cpp \
|
|
|
|
|
android_hardware_Camera.cpp \
|
|
|
|
|
android_hardware_SensorManager.cpp \
|
|
|
|
|
android_debug_JNITest.cpp \
|
|
|
|
|
android_util_FileObserver.cpp \
|
|
|
|
|
android/opengl/poly_clip.cpp.arm \
|
|
|
|
|
android/opengl/util.cpp.arm \
|
|
|
|
|
android_bluetooth_HeadsetBase.cpp \
|
|
|
|
|
android_bluetooth_common.cpp \
|
|
|
|
|
android_bluetooth_BluetoothAudioGateway.cpp \
|
2009-05-26 19:13:43 -07:00
|
|
|
android_bluetooth_BluetoothSocket.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_bluetooth_ScoSocket.cpp \
|
2009-08-14 18:33:38 -07:00
|
|
|
android_server_BluetoothService.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_server_BluetoothEventLoop.cpp \
|
|
|
|
|
android_server_BluetoothA2dpService.cpp \
|
2010-06-04 14:55:02 -07:00
|
|
|
android_server_Watchdog.cpp \
|
2009-03-03 19:31:44 -08:00
|
|
|
android_message_digest_sha1.cpp \
|
|
|
|
|
android_ddm_DdmHandleNativeHeap.cpp \
|
|
|
|
|
com_android_internal_os_ZygoteInit.cpp \
|
2009-05-06 18:06:21 -07:00
|
|
|
com_android_internal_graphics_NativeUtils.cpp \
|
2009-06-12 11:06:24 -07:00
|
|
|
android_backup_BackupDataInput.cpp \
|
2009-05-19 13:41:21 -07:00
|
|
|
android_backup_BackupDataOutput.cpp \
|
2009-06-25 18:29:18 -04:00
|
|
|
android_backup_FileBackupHelperBase.cpp \
|
2010-07-01 08:10:18 -07:00
|
|
|
android_backup_BackupHelperDispatcher.cpp \
|
2010-08-04 11:12:40 -07:00
|
|
|
android_content_res_ObbScanner.cpp \
|
|
|
|
|
android_content_res_Configuration.cpp
|
2009-03-03 19:31:44 -08:00
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES += \
|
|
|
|
|
$(JNI_H_INCLUDE) \
|
|
|
|
|
$(LOCAL_PATH)/android/graphics \
|
|
|
|
|
$(call include-path-for, bluedroid) \
|
|
|
|
|
$(call include-path-for, libhardware)/hardware \
|
|
|
|
|
$(call include-path-for, libhardware_legacy)/hardware_legacy \
|
|
|
|
|
$(LOCAL_PATH)/../../include/ui \
|
|
|
|
|
$(LOCAL_PATH)/../../include/utils \
|
|
|
|
|
external/skia/include/core \
|
|
|
|
|
external/skia/include/effects \
|
|
|
|
|
external/skia/include/images \
|
Add (hidden for now) purgeable bitmaps
BitmapFactory::Options now let you specify if the resulting bitmap can be
"purgeable". If so, then its decoded pixels may be purged when not actively
being drawn, freeing up that RAM. When such a bitmap is drawn, it will
automatically be re-decoded on demand. This is done by having the bitmap
keep a reference/copy of the encoded data.
Where it is a reference or a copy is controlled by the "shareable" flag in
Options. If this is true, the implementation *may* just reference the encode
data (e.g. a file descriptor) rathern than making a complete copy of it.
Currently, purgeable is not supported for generic inputstreams, but is
enabled for byte-array, file-descriptor, and assets, though for impl
reasons only file-descripts are currently enabled for "shareable", but that
may change in the future.
2009-04-24 11:09:12 -04:00
|
|
|
external/skia/src/ports \
|
2009-03-03 19:31:44 -08:00
|
|
|
external/skia/include/utils \
|
|
|
|
|
external/sqlite/dist \
|
|
|
|
|
external/sqlite/android \
|
|
|
|
|
external/expat/lib \
|
|
|
|
|
external/openssl/include \
|
|
|
|
|
external/tremor/Tremor \
|
|
|
|
|
external/icu4c/i18n \
|
|
|
|
|
external/icu4c/common \
|
2009-11-30 17:52:05 +08:00
|
|
|
external/jpeg \
|
2009-03-09 11:52:12 -07:00
|
|
|
frameworks/opt/emoji
|
2009-03-03 19:31:44 -08:00
|
|
|
|
|
|
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
|
|
|
libexpat \
|
|
|
|
|
libnativehelper \
|
|
|
|
|
libcutils \
|
|
|
|
|
libutils \
|
2009-05-18 15:08:03 -07:00
|
|
|
libbinder \
|
2009-03-03 19:31:44 -08:00
|
|
|
libnetutils \
|
|
|
|
|
libui \
|
2010-07-14 23:41:37 -07:00
|
|
|
libgui \
|
2010-02-09 17:46:37 -08:00
|
|
|
libsurfaceflinger_client \
|
|
|
|
|
libcamera_client \
|
2009-03-03 19:31:44 -08:00
|
|
|
libskiagl \
|
2009-07-10 15:33:21 -04:00
|
|
|
libskia \
|
2009-03-03 19:31:44 -08:00
|
|
|
libsqlite \
|
|
|
|
|
libdvm \
|
|
|
|
|
libEGL \
|
|
|
|
|
libGLESv1_CM \
|
2009-11-19 16:34:55 +08:00
|
|
|
libGLESv2 \
|
2009-12-28 19:31:43 +08:00
|
|
|
libETC1 \
|
2009-03-03 19:31:44 -08:00
|
|
|
libhardware \
|
|
|
|
|
libhardware_legacy \
|
|
|
|
|
libsonivox \
|
|
|
|
|
libcrypto \
|
|
|
|
|
libssl \
|
|
|
|
|
libicuuc \
|
|
|
|
|
libicui18n \
|
|
|
|
|
libmedia \
|
2009-11-30 17:52:05 +08:00
|
|
|
libwpa_client \
|
|
|
|
|
libjpeg
|
2009-03-03 19:31:44 -08:00
|
|
|
|
2010-09-23 16:12:11 -07:00
|
|
|
ifeq ($(BOARD_HAVE_NFC),true)
|
|
|
|
|
LOCAL_SHARED_LIBRARIES += \
|
|
|
|
|
libnfc_jni \
|
|
|
|
|
libnfc
|
|
|
|
|
|
|
|
|
|
LOCAL_CFLAGS += -DHAVE_NFC
|
|
|
|
|
endif
|
|
|
|
|
|
2009-03-03 19:31:44 -08:00
|
|
|
ifeq ($(BOARD_HAVE_BLUETOOTH),true)
|
|
|
|
|
LOCAL_C_INCLUDES += \
|
|
|
|
|
external/dbus \
|
2009-03-09 11:52:12 -07:00
|
|
|
system/bluetooth/bluez-clean-headers
|
2009-03-03 19:31:44 -08:00
|
|
|
LOCAL_CFLAGS += -DHAVE_BLUETOOTH
|
|
|
|
|
LOCAL_SHARED_LIBRARIES += libbluedroid libdbus
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifneq ($(TARGET_SIMULATOR),true)
|
|
|
|
|
LOCAL_SHARED_LIBRARIES += \
|
|
|
|
|
libdl
|
|
|
|
|
# we need to access the private Bionic header
|
|
|
|
|
# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
|
|
|
|
|
LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
LOCAL_LDLIBS += -lpthread -ldl
|
|
|
|
|
|
|
|
|
|
ifeq ($(TARGET_SIMULATOR),true)
|
|
|
|
|
ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)
|
|
|
|
|
LOCAL_LDLIBS += -lrt
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
|
|
|
|
|
LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
LOCAL_MODULE:= libandroid_runtime
|
|
|
|
|
|
|
|
|
|
include $(BUILD_SHARED_LIBRARY)
|
|
|
|
|
|
|
|
|
|
include $(call all-makefiles-under,$(LOCAL_PATH))
|
