David 'Digit' Turner
f249fb4fe0
am eff8b9de: am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit 'eff8b9de35890bf50093d38ef5e9e81557ad4a9c':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 02:51:26 -07:00
David 'Digit' Turner
eff8b9de35
am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit '39386d450fdc2f170f5f7c94d76c38061fd5a9e0':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 02:46:04 -07:00
David 'Digit' Turner
39386d450f
Merge "sdk: Copy ABI-specific kernel image to platform image directory."
2011-06-29 02:42:09 -07:00
David 'Digit' Turner
f7f6842b32
sdk: Copy ABI-specific kernel image to platform image directory.
...
This patch depends on https://review.source.android.com/24052
It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.
This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
prebuilt/android-arm/kernel/kernel-qemu
Change-Id: I0f175a1ba3d97f5c7420597bdeebc7a353551194
2011-06-29 11:32:17 +02:00
Anirudh Dewani
12c15c512b
am bc4ea2d9: am fea911d5: Network detection sample using TelephonyManager
...
* commit 'bc4ea2d9326f24097b0fdd8ca7090688c0f6743b':
Network detection sample using TelephonyManager
2011-06-29 02:18:53 -07:00
Anirudh Dewani
bc4ea2d932
am fea911d5: Network detection sample using TelephonyManager
...
* commit 'fea911d5359f1eb42ff8b9c70cd6f51500f539d4':
Network detection sample using TelephonyManager
2011-06-29 02:16:23 -07:00
David Turner
868d428666
am 4e9130a6: am bcb0c197: Merge "emulator opengl: fixed wrong delete"
...
* commit '4e9130a6f49bec0caceba6974b082a21f244b2c1':
emulator opengl: fixed wrong delete
2011-06-28 04:59:24 -07:00
David Turner
cb4d9ff2a8
am 26025f17: am 5b060ef9: Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* commit '26025f179e8e51bce376cf7fdad42bcfdcd58fff':
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 04:59:21 -07:00
David Turner
1cac4c4787
am b072bc8b: am 052effb8: Merge "Fix an iligal "free"."
...
* commit 'b072bc8bf3ea2c09f27495b5465daeb2cc7e517a':
Fix an iligal "free".
2011-06-28 04:59:19 -07:00
David Turner
4c5e4e1166
am f222e481: am 7c91ae77: Merge "tex 0 is legal."
...
* commit 'f222e481abfcc07bea69a90ce25fea702b5133b4':
tex 0 is legal.
2011-06-28 04:59:17 -07:00
David Turner
b955e57dc3
am ab37200b: am de74b496: Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
...
* commit 'ab37200b39ae24054c428479cbed63596297773d':
Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
2011-06-28 04:57:41 -07:00
David Turner
4e9130a6f4
am bcb0c197: Merge "emulator opengl: fixed wrong delete"
...
* commit 'bcb0c197a1d13d2c48ff98dd89f87f15486f1817':
emulator opengl: fixed wrong delete
2011-06-28 04:55:48 -07:00
David Turner
26025f179e
am 5b060ef9: Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* commit '5b060ef926eea0d92f43e1474a5bdbc2dc5794c5':
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 04:55:46 -07:00
David Turner
b072bc8bf3
am 052effb8: Merge "Fix an iligal "free"."
...
* commit '052effb85f939305f9ff6b743d3447e8e972b75e':
Fix an iligal "free".
2011-06-28 04:55:44 -07:00
David Turner
f222e481ab
am 7c91ae77: Merge "tex 0 is legal."
...
* commit '7c91ae77caa1b277bba162ada95a8a104da9923c':
tex 0 is legal.
2011-06-28 04:55:41 -07:00
David Turner
bcb0c197a1
Merge "emulator opengl: fixed wrong delete"
2011-06-28 04:45:32 -07:00
David Turner
ab37200b39
am de74b496: Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
...
* commit 'de74b496a11b962d9ca3d6188326093b6cfd0c88':
Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
2011-06-28 04:45:04 -07:00
David Turner
5b060ef926
Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* changes:
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 04:44:48 -07:00
David Turner
052effb85f
Merge "Fix an iligal "free"."
2011-06-28 04:39:41 -07:00
David Turner
7c91ae77ca
Merge "tex 0 is legal."
2011-06-28 04:38:57 -07:00
David Turner
de74b496a1
Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
2011-06-28 04:38:18 -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
Yochai Shefi Simchon
e02b38778a
Fix an iligal "free".
...
m_map[GL_TEXTURE_COORD_ARRAY] is not an allocated pointer, therefore it shouldn't be freed.
Change-Id: I84e2937c16ddcbb8922cdf270de86732ee966d60
2011-06-25 17:02:33 +03:00
Yochai Shefi Simchon
33cd758244
tex 0 is legal.
...
Change-Id: I99f59aa0aff1986e86e0954bb61924895b9b044f
2011-06-25 17:02:33 +03:00
Yochai Shefi Simchon
72233c6be3
Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
...
Change-Id: I6adb541649ec83f50f520e27a26814a47359b827
2011-06-25 17:02:33 +03:00
Guy Zadikario
a0b0d08e17
emulator opengl: fixed wrong delete
...
Solves a crash in Replica Island.
Change-Id: Id085cc2c88d0e3bdbf59f43882b7397b15ded05c
2011-06-25 16:56:08 +03:00
Guy Zadikario
0536060b40
emulator opengl: guest/host rendering syncronization.
...
Added a return value for rcFlushWindowColorBuffer and
rcUpdateColorBuffer in order to make those calls to block
with a round-trip to the host. This is to make sure that
the color buffer is up-to-date before the flinger use it
for rendering.
Also added a call to the native windows's lock function after
EGL is attached and bound to render on the window. This call
was missed before.
This syncronization can be optimized by removing the round-trip
and insert sync primitive to the stream at every draw command that
reads from a color buffer to make the sync happen on the host
before rendering the color buffer and remove the need for the
guest to wait for that update.
Change-Id: I1c2d8bc407b69663e992a68d5aa755f19bbe0ec3
2011-06-25 16:56:08 +03:00
Guy Zadikario
4ef1f3474e
emulator opengl: initialize new colorbuffers
...
Initialize new allocated color buffers with zeros.
Change-Id: I64a63c2eda83fdec1926c387e171324fb07ebe83
2011-06-25 16:56:08 +03:00
Stas Gurtovoy
88ad268dd9
emulator opengles: Fixed bug in gralloc unregister_buffer
...
Reset the ashmemBase & mappedPid on unregister_buffer
Change-Id: Ia209f88a15eb51edb39b1a799500d835b944bc87
2011-06-25 16:30:30 +03:00
Stas Gurtovoy
128f401e4f
emulator opengles: Fixed a bug in eglChooseConfig implementation.
...
The config_size argument in rcChooseConfig should match the number
of requested configs and not the size in bytes to store it.
Moved the configs array size computation into rendeerControl.attrib.
Change-Id: I9e797024522965a656764c20252b25ff5ae657f5
2011-06-25 16:30:30 +03:00
Stas Gurtovoy
fdcba322fe
opengles emulator: Fixed upside-down gl image
...
This fix performs a flip software copy to match our coords with those expected by the flinger.
We may think of a better implementation in the future.
Change-Id: Ic09a5d0e22f7e209b33c07c993a3d56e328dd3ed
2011-06-25 16:28:58 +03: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
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
Anirudh Dewani
fea911d535
Network detection sample using TelephonyManager
...
Change-Id: Iaa5b66a2eda07fd9de4ea613209226dd4ee64abd
Conflicts:
samples/ApiDemos/AndroidManifest.xml
2011-06-23 12:07:57 +05:30
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