Brian Muramatsu
854ab1ec1d
am cc90809c: Merge "Fix runtest for CTS Tests"
...
* commit 'cc90809c261dea1764bd6f8cd4455add6f6b1797':
Fix runtest for CTS Tests
2012-01-10 12:28:38 -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
8315e4bce5
am 86034fd4: am a93b8f1d: am b8cc9bcd: am e4ee58f3: Reference kernels in new location
...
* commit '86034fd49646d1120faf6852cfb2826a2f1d72a1':
Reference kernels in new location
2012-01-10 09:03:43 -08:00
Jesse Hall
1f30075c7f
am 56335392: am d23522e6: am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1
...
* commit '5633539268af0c8686ce97c174122e053ecbb774':
EmuGL: misc small cleanups
2012-01-10 09:02:49 -08:00
Jesse Hall
90f9afea71
am 8a5b5242: am 19b03e4e: am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
...
* commit '8a5b5242a4cf4e5be85f9e5fed1787027d92704b':
EmuGL: fix GL view position in window on OS X
2012-01-10 09:02:48 -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
Jean-Baptiste Queru
1c6e5773c4
am 1c4a74c9: Merge "Reference kernels in new location"
...
* commit '1c4a74c9eb291d67b69d1696470f77fe67abfd28':
Reference kernels in new location
2012-01-09 15:34:01 -08: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
Steve Block
9033d6efcf
am 5a622cba: Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
...
* commit '5a622cba8c5287d5e6577f940a22343a7cae977f':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
2012-01-09 11:22:47 -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
79d7709fc9
am 2a184c2c: am 98e5d57a: Reconcile with ics-mr1-release
...
* commit '2a184c2ce5d1a64665607f2f17a689968be826cb':
2012-01-07 00:42:04 -08: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
8460b530e8
am 8e822bd4: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"
...
* commit '8e822bd462aff69821442a02b85ed9c5dcbed341':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
2012-01-06 10:33:19 -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
75dee9a4f7
am b620cf22: Merge "ndk: disable logs in release builds of native_app_glue library."
...
* commit 'b620cf22eb2fc4fc44da51632413a33d3d444d87':
ndk: disable logs in release builds of native_app_glue library.
2012-01-06 04:10:06 -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
09c6c3c83f
am 32bbde6c: am 37340765: am 5621efe1: docs: Allow d.a.c. to serve .OGV
...
* commit '32bbde6c5d235c965c05c0bbc554497e31b01974':
docs: Allow d.a.c. to serve .OGV
2012-01-05 16:43:29 -08: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
cb46eed1eb
am 91cb6de5: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
...
* commit '91cb6de5e5c862ad25c4b494a27716e2bf9e697f':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
2012-01-05 14:09:15 -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
a140db8fa5
am 0a63c4c2: am 5225c6fb: Reconcile with ics-mr1-release
...
* commit '0a63c4c2af49ef149058253e164b4ea2bcd3ffef':
2012-01-05 12:12:58 -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
Jason Sams
c21692d09b
Merge "Fix headers" into graphics-dev
2012-01-04 17:50:52 -08:00
Jason Sams
fc2aded9ce
Fix headers
...
Change-Id: I74832252a5fc0fdc543c29ac1a85ce39a97b2821
2012-01-04 17:48:54 -08:00
Alex Sakhartchouk
185bb9b5cc
Merge "Stripping out geometry data, but keeping names and references instead of removing all geometric data." into graphics-dev
2012-01-04 17:18:44 -08: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
7ee245378c
am 112bc5e5: Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
...
* commit '112bc5e57e206ec3e0bc5a335b62eae2eb8892e8':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
2012-01-04 10:16:05 -08:00
Alex Sakhartchouk
40b0530285
Stripping out geometry data, but keeping names and references instead
...
of removing all geometric data.
Change-Id: I602d548f6ef41b9feba3b50b819501c3d59bf8c6
2012-01-03 17:39:38 -08: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