Commit Graph

8493 Commits

Author SHA1 Message Date
David 'Digit' Turner
e0ff98803f ndk: android-9: Add missing <sys/eventfd.h> header
For some reason, the header was missing from previous NDK releases.
Note: the function symbols are properly listed in arch-$ARCH/symbols/libc.so.functions.txt

Change-Id: I72bf307ccaf55c9b8fc344f5bbfa7b44ba673d62
2012-01-11 11:29:10 +01:00
Adam Powell
30e2c473e8 Merge "Catch IOException for close" 2012-01-10 14:11:49 -08:00
Steve Block
7d47e55717 Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 2012-01-10 14:08:30 -08:00
Adam Powell
e882d4c266 Catch IOException for close
Change-Id: I23115f6fa4f54fd4e1de59f3bb781dcf28e1371b
2012-01-10 14:07:23 -08:00
Adam Powell
87376a45e4 Merge "Add code sample for ShareCompat" 2012-01-10 13:31:09 -08:00
Brian Muramatsu
cc90809c26 Merge "Fix runtest for CTS Tests" 2012-01-10 12:27:23 -08:00
Brian Muramatsu
95cbc9e1ec Fix runtest for CTS Tests
The CTS packages use CTS-specific Makefiles rules like
BUILD_CTS_PACKAGE instead of BUILD_PACKAGE. Update runtest
to include CtsBuild.mk which defines all of these.

Change-Id: I6ea6c77b4f2ab113126319141e5120e016055c9d
2012-01-10 12:06:12 -08:00
Jean-Baptiste Queru
86034fd496 am a93b8f1d: am b8cc9bcd: am e4ee58f3: Reference kernels in new location
* commit 'a93b8f1d6dd52679d3c6a2ddffdb018406047364':
  Reference kernels in new location
2012-01-09 17:53:46 -08:00
Jean-Baptiste Queru
a93b8f1d6d am b8cc9bcd: am e4ee58f3: Reference kernels in new location
* commit 'b8cc9bcda92f4afbcaf654dae6ce51e19a1972b1':
  Reference kernels in new location
2012-01-09 17:51:33 -08:00
Jean-Baptiste Queru
b8cc9bcda9 am e4ee58f3: Reference kernels in new location
* commit 'e4ee58f3cb786dca4efccb090428a4429cc751c9':
  Reference kernels in new location
2012-01-09 17:49:23 -08:00
Jesse Hall
5633539268 am d23522e6: am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1
* commit 'd23522e614c517a50222796286a7fffb6c11bd14':
  EmuGL: misc small cleanups
2012-01-09 16:37:28 -08:00
Jesse Hall
8a5b5242a4 am 19b03e4e: am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
* commit '19b03e4ef1e7861b938dd7c52356af5396f456b3':
  EmuGL: fix GL view position in window on OS X
2012-01-09 16:37:27 -08:00
Jesse Hall
d23522e614 am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1
* commit 'f0baef2fed555e87a0910e5aab6b8b763487b350':
  EmuGL: misc small cleanups
2012-01-09 15:53:49 -08:00
Jesse Hall
19b03e4ef1 am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
* commit '409c49c526508b5fa36f8bc6edc1fc70cba5a3e1':
  EmuGL: fix GL view position in window on OS X
2012-01-09 15:53:48 -08:00
Jesse Hall
f0baef2fed Merge "EmuGL: misc small cleanups" into ics-mr1 2012-01-09 15:52:15 -08:00
Jesse Hall
409c49c526 Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 2012-01-09 15:51:40 -08:00
Steve Block
8ad367c36d Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I2eb298dae73ccfd8e9ee8350344d9f5c96f5c422
2012-01-09 21:35:44 +00:00
Jean-Baptiste Queru
e4ee58f3cb Reference kernels in new location
Change-Id: Ic2eae2fef0900e8a8f74cff00e427b99c970f036
2012-01-09 12:09:01 -08:00
Jean-Baptiste Queru
1c4a74c9eb Merge "Reference kernels in new location" 2012-01-09 12:03:56 -08:00
Jean-Baptiste Queru
07ffdd5c31 Reference kernels in new location
Change-Id: Ic2eae2fef0900e8a8f74cff00e427b99c970f036
2012-01-09 10:57:13 -08:00
Steve Block
5a622cba8c Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic6cac56d137f705dfa7266f21e9b0269219bd5d1
2012-01-09 10:39:43 +00:00
The Android Open Source Project
2a184c2ce5 am 98e5d57a: Reconcile with ics-mr1-release
* commit '98e5d57aa95640f5e6ee282067cc994f3ea4dd46':
2012-01-06 18:16:28 -08:00
The Android Open Source Project
98e5d57aa9 Reconcile with ics-mr1-release
Change-Id: Ide3a3c13469bf86114acbe443efe02f5b86743b8
2012-01-06 18:14:59 -08:00
The Android Automerger
0bd79f4b43 merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:31:26 -08:00
Steve Block
8e822bd462 Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE" 2012-01-06 10:30:47 -08:00
David 'Digit' Turner
b620cf22eb Merge "ndk: disable logs in release builds of native_app_glue library." 2012-01-06 04:07:47 -08:00
Steve Block
6aff44c27e Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I03c41e20d8f5d7f3c7ef1f01506885e3e250e921
2012-01-06 10:06:41 +00:00
Roman Nurik
32bbde6c5d am 37340765: am 5621efe1: docs: Allow d.a.c. to serve .OGV
* commit '373407653acfb9a90be78528067049d3114d0e3b':
  docs: Allow d.a.c. to serve .OGV
2012-01-05 16:41:05 -08:00
Roman Nurik
373407653a am 5621efe1: docs: Allow d.a.c. to serve .OGV
* commit '5621efe11cda8a885adc335f48b4d0c25ceb6f32':
  docs: Allow d.a.c. to serve .OGV
2012-01-05 16:38:48 -08:00
Roman Nurik
5621efe11c docs: Allow d.a.c. to serve .OGV
This is necessary for HTML5 video in Firefox.

Change-Id: Ifcc39c338db64aa6c05418c1f3235bda62081f9b
2012-01-05 16:32:03 -08:00
Steve Block
91cb6de5e5 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:06:36 -08:00
The Android Open Source Project
0a63c4c2af am 5225c6fb: Reconcile with ics-mr1-release
* commit '5225c6fb52c1628f8bd014c3c9a0c2b87f192dab':
2012-01-05 12:08:36 -08:00
Jesse Hall
a592d9c043 EmuGL: misc small cleanups
* Disable verbose debug spam.
* Add missing GL enum to utility function. The default case was
  returning the correct size, so this doesn't fix any bugs, just
  removes some logcat spam.
* Comment and whitespace corrections.

Change-Id: I83fb8644331ae1072d6a8dae9c041da92073089f
2012-01-05 10:50:01 -08:00
The Android Open Source Project
5225c6fb52 Reconcile with ics-mr1-release
Change-Id: I9836cd02d0be2bacef2f68cddb621e41f693b84f
2012-01-05 07:45:18 -08:00
David 'Digit' Turner
98f56b100c ndk: disable logs in release builds of native_app_glue library.
This patch disables all the logs from the 'native_app_glue' helper
library (used to implement native activities with the NDK), unless
you're building a debug build.

Change-Id: Iaad9d7c48a392ec119704074ab76e131d7806adb
2012-01-05 16:41:09 +01:00
The Android Automerger
6baffbb74b merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:41:23 -08:00
Jesse Hall
a4fb8a60b1 EmuGL: fix GL view position in window on OS X
The code that creates the GL-accelerated screen view wasn't converting
the upper-left-relative coordinates used within the emulator to the
lower-left coordinates used by the Cocoa APIs on OS X. Since most
skins have the screen view centered vertically this often just
happened to work.

Bug: 5782118
Change-Id: I2f96ee181e850df5676d10a82d86c94421149b40
2012-01-04 15:03:39 -08:00
Steve Block
cad4194fad Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ia7ba0ca669b2c4168d90837f9b409b21503f95f0
2012-01-04 21:08:55 +00:00
Steve Block
112bc5e57e Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: Ia14c98936bb1dc74e681bf2de342ad6861646778
2012-01-03 22:29:55 +00:00
Roman Nurik
dcea17d050 am 149663fe: am 9fe60c34: Allow d.a.c to serve webm and mp4
* commit '149663fe76f8c91021599916150e0e790063cfea':
  Allow d.a.c to serve webm and mp4
2012-01-02 11:27:12 -08:00
Roman Nurik
149663fe76 am 9fe60c34: Allow d.a.c to serve webm and mp4
* commit '9fe60c34a49c0be4d5014fb0e056959b4683304e':
  Allow d.a.c to serve webm and mp4
2012-01-02 11:25:41 -08:00
Roman Nurik
9fe60c34a4 Allow d.a.c to serve webm and mp4
Change-Id: I8c127642ee8bbeb5eda2cae0aaf2d0e902492a7a
2011-12-22 16:44:39 -08:00
Al Sutton
c9cfb3032d am 34e3d029: am 87879839: Fix build on MacOS 10.7 / XCode 4
* commit '34e3d0291b767807e55022688463bdef96569462':
  Fix build on MacOS 10.7 / XCode 4
2011-12-21 16:48:26 -08:00
Al Sutton
34e3d0291b am 87879839: Fix build on MacOS 10.7 / XCode 4
* commit '87879839f19faaa30577435842294edf3e562f66':
  Fix build on MacOS 10.7 / XCode 4
2011-12-21 16:47:05 -08:00
Al Sutton
87879839f1 Fix build on MacOS 10.7 / XCode 4
Ensure the dynamic library library gets linked in with SDL
to fix compilation errors

Change-Id: I32e6929088eaf73d707e89d10392c658b58ec465
2011-12-21 13:21:32 -08:00
The Android Open Source Project
e8fa72b3fa am 0f967c02: Reconcile with ics-mr1-release
* commit '0f967c02c113c62f17f3f3c93164269fb5818a36':
2011-12-21 07:21:39 -08:00
The Android Open Source Project
0f967c02c1 Reconcile with ics-mr1-release
Change-Id: Ibedde76d39b336b7a11b3793d824a3a4f933bf30
2011-12-21 07:19:15 -08:00
The Android Automerger
1fd9450082 merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:26:25 -08:00
The Android Open Source Project
1f3abd2b7b am c49f7610: Reconcile with ics-mr1-release
* commit 'c49f76108a615121615e290e2e4e19b59c4cf086':
2011-12-20 13:09:53 -08:00
The Android Open Source Project
c49f76108a Reconcile with ics-mr1-release
Change-Id: Ibafcd77c519fede8a61087378f6d842decd285bb
2011-12-20 13:08:27 -08:00