LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,590 Commits 2 Branches 0 Tags
7722b76683a8d35672a5b41b036810178fb65ebf
Commit Graph

8590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
7722b76683 am 5ec7bda1: am 40b67a0e: Merge 8aafafe4 
* commit '5ec7bda1f5686f8ce0236569931d2b881252f4fe':
  Fixed crash and 64-bit porting issues
 2012-03-22 13:03:31 -07:00
Jean-Baptiste Queru
5ec7bda1f5 am 40b67a0e: Merge 8aafafe4 
* commit '40b67a0eb0ae7c612dd30611121cf3c655c49793':
  Fixed crash and 64-bit porting issues
 2012-03-22 13:01:06 -07:00
Jean-Baptiste Queru
40b67a0eb0 Merge 8aafafe4 
Change-Id: I41f097b5b96c4d000b1748b9e0411497d323556a
 2012-03-22 12:57:54 -07:00
Andrew Hsieh
8aafafe4bd Fixed crash and 64-bit porting issues 
1. "emugen" generates four *dec.cpp files containing code like this
   to decode offset to pointer in stream

   tmp = *(T *)(ptr + 8 + 4 + 4 + 4 + *(size_t *)(ptr +8 + 4 + 4));

   If *dec.cpp are compiled in 64-bit, size_t is 8-byte and dereferencing of
   it is likley to get wild offset for dereferencing of *(T *) to crash the
   code.  Solution is to define tsize_t for "target size_t" instead
   of using host size_t.

2. Cast pointer to "uintptr_t" instead of "unsigned int" for 2nd param of
   ShareGroup::getGlobalName(NamedObjectType, ObjectLocalName/*64bit*/).
3. Instance of EGLSurface, EGLContext and EGLImageKHR are used as 32-bit
   key for std::map< unsigned int, * > SurfacesHndlMap, ContextsHndlMap,
   and ImagesHndlMap, respectively.  Cast pointer to uintptr_t and assert
   upper 32-bit is zero before passing to map::find().
4. Instance of GLeglImageOES is used to eglAttachEGLImage() which expect
   "unsigned int".  Cast it to uintptr_t and assert upper 32-bit is zero.
5. The 5th param to GLEScontext::setPointer is GLvoid* but contains 32-bit
   offset to vbo if bufferName exists.  Cast it to uintptr_t and assert
   upper 32-bit is zero.
6. Use %zu instead of %d to print size_t
7. Cast pointer to (uintptr_t) in many other places

Change-Id: Iba6e5bda08c43376db5b011e9d781481ee1f5a12
 2012-03-22 11:10:31 -07:00
Xavier Ducrohet
5934ff4f3d am 5756679f: am 37bae214: Add flag indicating gpu support in emulator system image. 
* commit '5756679f28466cddc95dc99b9e124792716f95f0':
 2012-03-21 16:51:48 -07:00
Xavier Ducrohet
13dbd7d2eb am 3280e948: am 37bae214: Add flag indicating gpu support in emulator system image. 
* commit '3280e9480fa6e8061e9d819ae64ec7ba948a94f5':
  Add flag indicating gpu support in emulator system image.
 2012-03-21 16:51:13 -07:00
Xavier Ducrohet
5756679f28 am 37bae214: Add flag indicating gpu support in emulator system image. 
* commit '37bae214eed57ab4b9908fb07a6be3c0f8bf141b':
  Add flag indicating gpu support in emulator system image.
 2012-03-21 16:48:22 -07:00
Xavier Ducrohet
3280e9480f am 37bae214: Add flag indicating gpu support in emulator system image. 
* commit '37bae214eed57ab4b9908fb07a6be3c0f8bf141b':
  Add flag indicating gpu support in emulator system image.
 2012-03-21 16:48:17 -07:00
Xavier Ducrohet
37bae214ee Add flag indicating gpu support in emulator system image. 
Change-Id: I21040f50f8e95b389c1e6db2de93654be6da6f7e
 2012-03-21 16:44:12 -07:00
The Android Open Source Project
e8e957575c am 9bb6dd28: Reconcile with ics-mr1-release 
* commit '9bb6dd28e0bda29c38313adc4f4627abf4407014':
 2012-03-21 09:03:27 -07:00
The Android Open Source Project
9bb6dd28e0 Reconcile with ics-mr1-release 
Change-Id: Icab4caf108e40f8c9ff384a58f6ae556529efa84
 2012-03-21 09:00:37 -07:00
The Android Open Source Project
34f1e01412 am cbd78651: Reconcile with ics-mr1-release 
* commit 'cbd78651ba6c8a9c6c2cac5c7872b35bbd5b355a':
 2012-03-21 08:25:05 -07:00
The Android Open Source Project
cbd78651ba Reconcile with ics-mr1-release 
Change-Id: I01fb273b93fb7adff59608eb6b7d8395149e3cc0
 2012-03-21 08:22:54 -07:00
The Android Automerger
885cc0e7d4 merge in ics-mr1-release history after reset to ics-mr1 2012-03-16 19:31:09 -07:00
Xavier Ducrohet
cd6962c8b8 am 9c583814: am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 
* commit '9c583814c71551c0da6edd6446ff58aa6f8c6ff5':
 2012-03-16 09:46:02 -07:00
Xavier Ducrohet
48a4de8c84 am 024201a3: am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 
* commit '024201a3b3d8a75da94e4483520859450a3d7353':
  Add eclipse+readme files to prebuilt of v7-grid. do not merge.
 2012-03-16 09:44:42 -07:00
Xavier Ducrohet
024201a3b3 am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 
* commit 'a205c3ad2a8102d8ba681ad358cd3470bc237be6':
  Add eclipse+readme files to prebuilt of v7-grid. do not merge.
 2012-03-16 09:42:25 -07:00
Xavier Ducrohet
9c583814c7 am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 
* commit 'a205c3ad2a8102d8ba681ad358cd3470bc237be6':
  Add eclipse+readme files to prebuilt of v7-grid. do not merge.
 2012-03-16 09:42:21 -07:00
Xavier Ducrohet
a205c3ad2a Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 2012-03-16 09:40:37 -07:00
Xavier Ducrohet
65b242b151 Add eclipse+readme files to prebuilt of v7-grid. do not merge. 
Change-Id: Ife58a0f2abf8ee13c2973ff57b2aaedfd9d78d59
 2012-03-16 09:39:57 -07:00
Robert Ly
9ef633a0ff am 38eb1f7f: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1 
* commit '38eb1f7fa4519d55da1d013a2db790eff425fd89':
 2012-03-14 15:47:31 -07:00
Robert Ly
28744c3499 am b7875ba1: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1 
* commit 'b7875ba1d5497a264b2d73b2d0f40931a8894828':
  update searchable dictionary for Android U class
 2012-03-14 15:46:39 -07:00
Robert Ly
38eb1f7fa4 am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1 
* commit '6630bfd9ac3df7ee11c3b8e9abd4c1ee2b58fc17':
  update searchable dictionary for Android U class
 2012-03-14 15:43:18 -07:00
Robert Ly
b7875ba1d5 am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1 
* commit '6630bfd9ac3df7ee11c3b8e9abd4c1ee2b58fc17':
  update searchable dictionary for Android U class
 2012-03-14 15:43:03 -07:00
Robert Ly
6630bfd9ac Merge "update searchable dictionary for Android U class" into ics-mr1 2012-03-14 15:40:41 -07:00
Robert Ly
7d5b68ca79 update searchable dictionary for Android U class 
Change-Id: Ib214400bae29ab2c4a34500dcf84b415ab13b77c
 2012-03-13 15:23:35 -07:00
The Android Automerger
385258187c merge in ics-mr1-release history after reset to ics-mr1 2012-03-12 19:31:42 -07:00
Raphael Moll
d42bec86dd am 8ff88c36: am af574136: Support lib: use /samples directory. do not merge. 
* commit '8ff88c3672461260d1c3b255714d701aec1bfac2':
 2012-03-12 12:32:24 -07:00
Raphael Moll
bc86d23849 am a4c2cb77: am af574136: Support lib: use /samples directory. do not merge. 
* commit 'a4c2cb77b51bc2b2faa615e8a6bfa20f24998269':
  Support lib: use /samples directory. do not merge.
 2012-03-12 12:32:04 -07:00
Raphael Moll
a4c2cb77b5 am af574136: Support lib: use /samples directory. do not merge. 
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
  Support lib: use /samples directory. do not merge.
 2012-03-12 12:30:20 -07:00
Raphael Moll
8ff88c3672 am af574136: Support lib: use /samples directory. do not merge. 
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
  Support lib: use /samples directory. do not merge.
 2012-03-12 12:29:59 -07:00
Raphael Moll
af57413607 Support lib: use /samples directory. do not merge. 
This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.

Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/

(Cherry-pick from 913d903aa2)

Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
 2012-03-12 12:27:02 -07:00
The Android Automerger
5396ffc7a9 merge in ics-mr1-release history after reset to ics-mr1 2012-03-10 09:06:40 -08:00
The Android Automerger
1f0ab0347f merge in ics-mr1-release history after reset to ics-mr1 2012-03-09 19:23:06 -08:00
The Android Automerger
3d17b9896f merge in ics-mr1-release history after reset to ics-mr1 2012-03-08 20:43:39 -08:00
Megha Joshi
4b46b0756f am ca2728fe: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit 'ca2728fe1f4a2592d5cb780ccf8cc756494a8752':
 2012-03-08 12:25:32 -08:00
Megha Joshi
8288333b0a am 3174fec7: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '3174fec75f73b92fdaac2958e3cf0c4b6be6a562':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
 2012-03-08 12:24:14 -08:00
Megha Joshi
ca2728fe1f am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
 2012-03-08 12:22:03 -08:00
Megha Joshi
3174fec75f am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
 2012-03-08 12:21:52 -08:00
Megha Joshi
27a6a0f0a5 Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 2012-03-08 12:20:00 -08:00
Derek Sollenberger
3565ea1a6e am 89e98da5: am a848b972: am 89b7a104: Merge "Add missing includes for threads.h" 
* commit '89e98da5ac2596bd532bd6209ee3bda5a3842577':
  Add missing includes for threads.h
 2012-03-08 11:32:04 -08:00
Derek Sollenberger
89e98da5ac am a848b972: am 89b7a104: Merge "Add missing includes for threads.h" 
* commit 'a848b97255a15d2ac75db1e367cc60ff46b77e20':
  Add missing includes for threads.h
 2012-03-08 11:30:09 -08:00
Derek Sollenberger
a848b97255 am 89b7a104: Merge "Add missing includes for threads.h" 
* commit '89b7a104d41c1ecbc1319a3d47199d40d56ebc96':
  Add missing includes for threads.h
 2012-03-08 11:28:31 -08:00
Derek Sollenberger
89b7a104d4 Merge "Add missing includes for threads.h" 2012-03-08 08:46:53 -08:00
Xavier Ducrohet
e3f5f497b2 am 83bf8d16: am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit '83bf8d1673800954c8e7bb474a6a6b4519d33745':
 2012-03-07 20:10:30 -08:00
Xavier Ducrohet
abcaa39070 am 624c4870: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit '624c487060ff8b20992a738bd8d6ff04ef247fa3':
 2012-03-07 20:10:29 -08:00
Xavier Ducrohet
3a499b0fed am 8438213c: am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit '8438213c2fc9aff20c3244dca5a1b30fadcb5785':
  Prepare for doc package update in rev 2. do not merge.
 2012-03-07 20:09:33 -08:00
Xavier Ducrohet
1754063ff0 am 198705d1: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit '198705d1ab7f818b146c0c6e0d85f80e4b658e06':
  Add a prebuilt of the gridlayout support library. do not merge
 2012-03-07 20:09:32 -08:00
Xavier Ducrohet
8438213c2f am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit '88d972501ae16197ebabb2f053a69856bca410d9':
  Prepare for doc package update in rev 2. do not merge.
 2012-03-07 20:07:39 -08:00
Xavier Ducrohet
198705d1ab am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
  Add a prebuilt of the gridlayout support library. do not merge
 2012-03-07 20:07:38 -08:00