David 'Digit' Turner
e89c5e20a0
am 5853cce9: am 97c9b03f: am a6896d75: am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit '5853cce9d0a28ff4ee64909af86dc40e1639e9b8':
ndk: x86: Update android-9 x86 platform files
2011-06-27 14:15:43 -07:00
David 'Digit' Turner
5853cce9d0
am 97c9b03f: am a6896d75: am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit '97c9b03f62cc7d1102d5f4803bb8ed2b511ed060':
ndk: x86: Update android-9 x86 platform files
2011-06-27 10:53:27 -07:00
David 'Digit' Turner
97c9b03f62
am a6896d75: am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit 'a6896d75d1985270a39e12676469a59dcbb096eb':
ndk: x86: Update android-9 x86 platform files
2011-06-27 10:47:29 -07:00
David 'Digit' Turner
a6896d75d1
am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit '402b02f8ecbbed55539ee6afd6141bcaad1cc7c3':
ndk: x86: Update android-9 x86 platform files
2011-06-27 10:21:58 -07:00
David 'Digit' Turner
402b02f8ec
Merge "ndk: x86: Update android-9 x86 platform files"
2011-06-27 04:39:55 -07:00
David 'Digit' Turner
2409c5a6d7
ndk: x86: Update android-9 x86 platform files
...
This updates the platform files for API level 9 on x86 to
the binaries built from the internal Gingerbread branch
containing the back-ported AOSP x86 support patches.
Change-Id: I5bc43b4a5c346f7fab8eb57289803edc0c0f2d75
2011-06-24 22:39:14 +02:00
David 'Digit' Turner
6ab8e331e3
am 07bd4949: am bf115d33: am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."
...
* commit '07bd49498684cf905eeab6260a4de11f8ebc4f64':
sdk: Ensure we copy build.prop to platform image directory.
2011-06-24 10:50:47 -07:00
David 'Digit' Turner
229cc8fc89
am 4a2a7caf: am 80e88b37: am 993178d2: am 588d3e7a: Merge "emulator: opengl: Update/simplify build scripts"
...
* commit '4a2a7caf951c606e2796cf273a1459ce6f0af6cd':
emulator: opengl: Update/simplify build scripts
2011-06-24 10:50:28 -07:00
Raphael
effacceabd
am eae54028: am 0221f2d8: am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.
...
* commit 'eae54028c2d763c4edd7129f5d9b91d6541b6dea':
Package the 2 llvm-rs-cc versions in the Windows SDK.
2011-06-23 14:31:19 -07:00
Xavier Ducrohet
01fa6e5ece
am 08419fc7: am 608bb77f: am 79aa3cea: Prepare new plat-tools SDK component with 2 llvm versions.
...
* commit '08419fc7ba3251fa1b059136abc63db24ad7ef1d':
Prepare new plat-tools SDK component with 2 llvm versions.
2011-06-23 14:31:02 -07:00
David Turner
e6911c05fc
am e8b6d94f: am 12e9736f: am f528fddf: am bd414ea2: Merge "opengl translator: fix eglGetConfigAttrib"
...
* commit 'e8b6d94fa3e901372860995dc2d0db07620310a3':
opengl translator: fix eglGetConfigAttrib
2011-06-23 07:49:56 -07:00
David Turner
b12c8370db
am 8b712206: am 5605bd75: am 227247ea: am 8e706026: Merge "opengl translator: conformance fixes"
...
* commit '8b7122068e76a9d9215d691663a2661a976dd861':
opengl translator: conformance fixes
2011-06-23 07:49:53 -07:00
David Turner
007e62d167
am 2284ef40: am 15b6cc56: am b4b448a9: am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."
...
* commit '2284ef400c8e94c782e3c4d392bf6767fb1f1d85':
emulator gralloc: removed compilation warnings.
2011-06-23 07:49:50 -07:00
David Turner
35fa0a9a0f
am a792c749: am 47271614: am cb0cad4b: am 4e18d73d: Merge "emulator opengl: Fix gralloc color buffer uploads"
...
* commit 'a792c7495d2c342ce5de9803281bf33a51973a40':
emulator opengl: Fix gralloc color buffer uploads
2011-06-23 07:49:46 -07:00
David Turner
4d9d221a01
am 347a98cd: am 95d7f3ce: am 00736340: am ec3f9a75: Merge "emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig"
...
* commit '347a98cd249c70c362c427fada9526afc65c7c37':
emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig
2011-06-23 07:49:43 -07:00
David Turner
91c685f105
am 4be3c181: am 3001b512: am c848f113: am ad66b123: Merge "emulator opengl: fix crash in gralloc_free"
...
* commit '4be3c18126dbfc19e783ee86cd11de67b395277d':
emulator opengl: fix crash in gralloc_free
2011-06-23 07:49:39 -07:00
David Turner
ba71934340
am e38f9f31: am c76cd1af: am 49c24102: am 97dfbff4: Merge "emulator opengl: implement glGetString"
...
* commit 'e38f9f31a0b8d29d513286032ad79b2fc8214e82':
emulator opengl: implement glGetString
2011-06-23 07:49:35 -07:00
David Turner
694422de04
am daaabe8a: am 1d8ebc35: am 4f2b6309: am 5b675210: Merge "emulator opengl: use eglGetProcAddress in EGL dispatch."
...
* commit 'daaabe8a8d47af6745f2d29d5eb84a6e3db16ca5':
emulator opengl: use eglGetProcAddress in EGL dispatch.
2011-06-23 07:48:15 -07:00
David Turner
25308eed19
am 6d9eb604: am 7fb8f627: am fa60dc0a: am c3349b5a: Merge "emulator egl translator: Fix eglGetProcAddress."
...
* commit '6d9eb604639c26bcf59610c5c8527b1c5be98c82':
emulator egl translator: Fix eglGetProcAddress.
2011-06-23 07:48:10 -07:00
David Turner
d33845d070
am cdb5dd35: am b0361b1c: am 022254b8: am f4c9f254: Merge "opengl renderer: Fixed colorBuffer texture creation."
...
* commit 'cdb5dd355047c15d4fa456630a1df596623a7d80':
opengl renderer: Fixed colorBuffer texture creation.
2011-06-23 07:48:06 -07:00
David Turner
68c38f44a3
am 4391d215: am c0f900b7: am 5f326344: am 025c1f7f: Merge "emulator opengl: Fix bug when re-binding the same context"
...
* commit '4391d215e13da52f287ff8d70fa52c52c84c9772':
emulator opengl: Fix bug when re-binding the same context
2011-06-23 07:48:00 -07:00
David Turner
839e06ad4a
am 7944a9a6: am ac921443: am ef6691f2: am 3ef2b6bf: Merge "emulator opengl: more few fixups needed for the system to load."
...
* commit '7944a9a6c9eda426ea3af188c8dfcf1093fdd12c':
emulator opengl: more few fixups needed for the system to load.
2011-06-23 07:47:55 -07:00
David Turner
842a48936c
am 47138a6e: am 426420ab: am 91acad1a: am 1c39202b: Merge "emulator opengl: pool of fixups to the host side."
...
* commit '47138a6e4a01e747f553b1f5165b7c5130763464':
emulator opengl: pool of fixups to the host side.
2011-06-23 07:47:50 -07:00
David Turner
21f6af6cd9
am 59970b6d: am 7304f16f: am 8f709075: am 3f5c9555: Merge "emulator opengl: pool of fixups to the system components."
...
* commit '59970b6d1156581c1aa983cde4c89ea9e0343aac':
emulator opengl: pool of fixups to the system components.
2011-06-23 07:46:53 -07:00
David Turner
45dee38b28
am 25354d60: am 97ae42d7: am 02c5d31f: am 6aef5092: Merge "emulator opengl: added Bind texture to EGLImage/surface"
...
* commit '25354d605d6402b3d1de8647ad752fa6af1b8b4c':
emulator opengl: added Bind texture to EGLImage/surface
2011-06-23 07:46:47 -07:00
David Turner
405acc2bf1
am f70e6700: am ad070202: am e0126df2: am 390b0753: Merge "emulator opengl: Added glFinishRoundTrip to GLESv2"
...
* commit 'f70e6700c50a9236f1108db190510f4baefefe53':
emulator opengl: Added glFinishRoundTrip to GLESv2
2011-06-23 07:46:37 -07:00
David 'Digit' Turner
07bd494986
am bf115d33: am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."
...
* commit 'bf115d33f26949b636d8cac79d253448fbca2388':
sdk: Ensure we copy build.prop to platform image directory.
2011-06-23 06:25:42 -07:00
David 'Digit' Turner
bf115d33f2
am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."
...
* commit '29bcef8fb862924eaa5a7b0fe684d714e75ab028':
sdk: Ensure we copy build.prop to platform image directory.
2011-06-23 06:23:43 -07:00
David 'Digit' Turner
29bcef8fb8
am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."
...
* commit '688620eb319070c5f2d84d9c9b2915cb4a3946e5':
sdk: Ensure we copy build.prop to platform image directory.
2011-06-23 06:21:42 -07:00
David 'Digit' Turner
688620eb31
Merge "sdk: Ensure we copy build.prop to platform image directory."
2011-06-23 06:05:47 -07:00
David 'Digit' Turner
4a2a7caf95
am 80e88b37: am 993178d2: am 588d3e7a: Merge "emulator: opengl: Update/simplify build scripts"
...
* commit '80e88b371389fe220cfdfc4a40ffdeb38fce484e':
emulator: opengl: Update/simplify build scripts
2011-06-23 05:30:07 -07:00
David 'Digit' Turner
80e88b3713
am 993178d2: am 588d3e7a: Merge "emulator: opengl: Update/simplify build scripts"
...
* commit '993178d26a4ed5c863e7fc96124208f23bcfc566':
emulator: opengl: Update/simplify build scripts
2011-06-23 05:10:44 -07:00
David 'Digit' Turner
993178d26a
am 588d3e7a: Merge "emulator: opengl: Update/simplify build scripts"
...
* commit '588d3e7aafae69062fe22bb20af9f55b7ae1711d':
emulator: opengl: Update/simplify build scripts
2011-06-23 05:03:50 -07:00
David 'Digit' Turner
588d3e7aaf
Merge "emulator: opengl: Update/simplify build scripts"
2011-06-23 04:46:49 -07:00
Raphael
eae54028c2
am 0221f2d8: am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.
...
* commit '0221f2d8a084798d279ae8de9bb3a59d934b030f':
Package the 2 llvm-rs-cc versions in the Windows SDK.
2011-06-22 19:08:47 -07:00
Xavier Ducrohet
08419fc7ba
am 608bb77f: am 79aa3cea: Prepare new plat-tools SDK component with 2 llvm versions.
...
* commit '608bb77f3f13727dbca986bca764644e510283c7':
Prepare new plat-tools SDK component with 2 llvm versions.
2011-06-22 19:08:38 -07:00
Raphael
0221f2d8a0
am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.
...
* commit '320d10ef623c04f3a2fa44af8823fa711a2e6573':
Package the 2 llvm-rs-cc versions in the Windows SDK.
2011-06-22 19:03:40 -07:00
Xavier Ducrohet
608bb77f3f
am 79aa3cea: Prepare new plat-tools SDK component with 2 llvm versions.
...
* commit '79aa3cea3a00276f49f6987bf1e49b40c3b011c0':
Prepare new plat-tools SDK component with 2 llvm versions.
2011-06-22 19:03:38 -07:00
David 'Digit' Turner
8422a11a21
emulator: opengl: Update/simplify build scripts
...
This patch is a major rework of the build opengl-emulation
build scripts. See README for details.
In a nutshell, this introduces various functions that considerably
simplify the declaration of the 26+ modules in this implementation,
by handling auto-generation of sources and module imports/exports.
Change-Id: I827522d783c7b6cf5eafd37204a1025c235458cd
2011-06-23 00:35:54 +02:00
Raphael
320d10ef62
Package the 2 llvm-rs-cc versions in the Windows SDK.
...
Change-Id: I7ae8f95b1e173ecc1c5efd6200dfce63b79d9b6c
2011-06-22 15:27:49 -07:00
Xavier Ducrohet
79aa3cea3a
Prepare new plat-tools SDK component with 2 llvm versions.
...
The output of the platform tree build is llvm-rs-cc-2 and should
be used for apps targeting 12+. This is encoded in llvm-rs-cc.txt
The older (HC) version of llvm-rs-cc is copied from the prebuilt
and is used for apps targeting 11+.
Until new tools that can read/process llvm-rs-cc.txt are released,
old tools will use the HC version of llvm-rs-cc which ensure
proper compatibility.
Change-Id: Iddb924409cc9238531bf1a0448b14b7eac3396a5
2011-06-22 15:27:44 -07:00
Gilles Debunne
40235387e6
Merge "Add SwitchPreference demo in ApiDemos."
2011-06-22 08:49:08 -07:00
David Turner
e8b6d94fa3
am 12e9736f: am f528fddf: am bd414ea2: Merge "opengl translator: fix eglGetConfigAttrib"
...
* commit '12e9736f8ce84a055af0fb09e17aab53abb49a1c':
opengl translator: fix eglGetConfigAttrib
2011-06-22 00:21:24 -07:00
David Turner
8b7122068e
am 5605bd75: am 227247ea: am 8e706026: Merge "opengl translator: conformance fixes"
...
* commit '5605bd75c13e9272cd0a1d8db7fc09b072960b6f':
opengl translator: conformance fixes
2011-06-22 00:21:22 -07:00
David Turner
2284ef400c
am 15b6cc56: am b4b448a9: am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."
...
* commit '15b6cc560eccbfe98e9ff3388218b70d2206ce20':
emulator gralloc: removed compilation warnings.
2011-06-22 00:19:16 -07:00
David Turner
a792c7495d
am 47271614: am cb0cad4b: am 4e18d73d: Merge "emulator opengl: Fix gralloc color buffer uploads"
...
* commit '472716143c3349f554ff39dfaeaa5b2f2d17b7f7':
emulator opengl: Fix gralloc color buffer uploads
2011-06-22 00:19:13 -07:00
David Turner
347a98cd24
am 95d7f3ce: am 00736340: am ec3f9a75: Merge "emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig"
...
* commit '95d7f3ce1d53c30c9302ae5f923b3494c76fe0d2':
emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig
2011-06-22 00:19:09 -07:00
David Turner
4be3c18126
am 3001b512: am c848f113: am ad66b123: Merge "emulator opengl: fix crash in gralloc_free"
...
* commit '3001b512438489df64dc83837eff4d1e220d058b':
emulator opengl: fix crash in gralloc_free
2011-06-22 00:19:06 -07:00
David Turner
e38f9f31a0
am c76cd1af: am 49c24102: am 97dfbff4: Merge "emulator opengl: implement glGetString"
...
* commit 'c76cd1afbcf26bf211f697ac6174988743a25eff':
emulator opengl: implement glGetString
2011-06-22 00:18:57 -07:00
David Turner
12e9736f8c
am f528fddf: am bd414ea2: Merge "opengl translator: fix eglGetConfigAttrib"
...
* commit 'f528fddf95143acc6384b74c00276055c447e49c':
opengl translator: fix eglGetConfigAttrib
2011-06-21 23:58:26 -07:00