Andrew Hsieh
17a180c959
am a295480f: am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit 'a295480fa627e4f0fac0a3a5f992b9e69b4fc062':
Rewrite ARM crtbegin* as C files
2012-09-06 18:33:46 -07:00
Andrew Hsieh
a295480fa6
am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit '4102c6f241153cb04e2fad7900ffbc07841c1381':
Rewrite ARM crtbegin* as C files
2012-09-06 18:31:47 -07:00
Andrew Hsieh
4102c6f241
am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit 'b833605a2bf5c27ff57cf5508fc58bca351c2470':
Rewrite ARM crtbegin* as C files
2012-09-06 18:30:03 -07:00
Andrew Hsieh
b833605a2b
Merge "Rewrite ARM crtbegin* as C files"
2012-09-06 18:14:38 -07:00
Dianne Hackborn
5bed441444
am 51f241cb: Merge "API demo for nesting fragments." into jb-mr1-dev
...
* commit '51f241cbee24727175f5ef369e312d21363f6272':
API demo for nesting fragments.
2012-09-06 11:47:25 -07:00
Eino-Ville Talvala
87ae2ac865
am cfd8132a: Merge "EmulatedFakeCamera2: Split AE/AWB mode and lock" into jb-mr1-dev
...
* commit 'cfd8132af00e517a5442a5a077354dac40b1aa21':
EmulatedFakeCamera2: Split AE/AWB mode and lock
2012-09-06 11:45:00 -07:00
Dianne Hackborn
51f241cbee
Merge "API demo for nesting fragments." into jb-mr1-dev
2012-09-06 11:44:22 -07:00
Eino-Ville Talvala
cfd8132af0
Merge "EmulatedFakeCamera2: Split AE/AWB mode and lock" into jb-mr1-dev
2012-09-06 11:42:46 -07:00
Dianne Hackborn
f3f7c5f775
API demo for nesting fragments.
...
Change-Id: I7f20e4f00cf68c78c578ae620a95de7fa97f0761
2012-09-06 11:39:30 -07:00
The Android Open Source Project
9709d7fc11
am 310bc879: am 51535bf8: (-s ours) Reconcile with jb-release - do not merge
...
* commit '310bc879f95291339f1efe34ddc8f7fa2ba8fdf9':
2012-09-06 09:13:48 -07:00
The Android Open Source Project
310bc879f9
am 51535bf8: (-s ours) Reconcile with jb-release - do not merge
...
* commit '51535bf8ad7d950e05df7c16e4e6a35effc29e83':
2012-09-06 09:11:31 -07:00
The Android Open Source Project
51535bf8ad
Reconcile with jb-release - do not merge
...
Change-Id: I2d47692562ca20d2e2e356ae569a2dbf1caeef0c
2012-09-06 08:08:14 -07:00
The Android Open Source Project
b74cdde676
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I17d2fef9d303c34015d889816c369a2e5899e65d
2012-09-06 07:53:00 -07:00
Andrew Hsieh
d0b834c7ad
Rewrite ARM crtbegin* as C files
...
This is port of related CLs:
9d40326830c2bd407427889c554adeb915ee6b4a
f3cfcd869ded41d25c1f4f4e48e7c374a64f9583
Summary: By placing __PREINIT_ARRAY__, __INIT_ARRAY__, __FINI_ARRAY__
and __CTOR_LIST__ on stack, this change allows PIC w/o relying on text
relocations.
Change-Id: I02a1b496b16aba692f4f9fa998a71efd943689fd
2012-09-06 15:27:56 +08:00
The Android Automerger
52f99e55cc
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:33:32 -07:00
Eino-Ville Talvala
dfe8cfa153
am 7002083f: Merge "Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""" into jb-mr1-dev
...
* commit '7002083f083d1139a30ac530ce8b914e6c5e91ef':
Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""
2012-09-04 16:24:39 -07:00
Eino-Ville Talvala
ea7a061c9c
am f8ddf2e5: Merge "Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""" into jb-mr1-dev
...
* commit 'f8ddf2e53896c46be4171d05579a081a519c5b52':
Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""
2012-09-04 16:24:38 -07:00
Eino-Ville Talvala
7002083f08
Merge "Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""" into jb-mr1-dev
2012-09-04 16:22:12 -07:00
Eino-Ville Talvala
f8ddf2e538
Merge "Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""" into jb-mr1-dev
2012-09-04 16:22:12 -07:00
Eino-Ville Talvala
f11b793ffb
Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""
...
Missing project ready to go.
This reverts commit 75832395dd
Change-Id: I48f6dee11248de5a12b66bd7fbc724c82517fe3a
2012-09-04 14:21:30 -07:00
Eino-Ville Talvala
18f28c0c21
Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""
...
Missing project ready to go.
This reverts commit 9642da5102
Change-Id: I08a43e9cdcb06bd6b74fd08809bbaf801c2eb44f
2012-09-04 14:21:19 -07:00
Eino-Ville Talvala
7e2ae6af74
am f0063b29: Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev
...
* commit 'f0063b298b078df61d7b80bfdbb9ea28515ed615':
Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
2012-09-04 12:29:29 -07:00
Eino-Ville Talvala
3cb39916c1
am 7b8420e2: Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev
...
* commit '7b8420e2ab2759eaa44921285a76e3812e76644b':
Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
2012-09-04 12:29:27 -07:00
Eino-Ville Talvala
f0063b298b
Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev
2012-09-04 12:28:05 -07:00
Eino-Ville Talvala
9468d306ee
am c07123b1: Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
...
* commit 'c07123b1efa5dbc1ece200ed951700bb27276294':
EmulatedFakeCamera2: Add precapture trigger and reprocess support
2012-09-04 12:27:59 -07:00
Eino-Ville Talvala
7b8420e2ab
Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev
2012-09-04 12:27:56 -07:00
Eino-Ville Talvala
9642da5102
Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
...
More dependent projects than I realized
This reverts commit a84522d2f3
Change-Id: Ifb50c94a2a5dfa91573f07695d8f3bfcadc79742
2012-09-04 12:27:04 -07:00
Eino-Ville Talvala
75832395dd
Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
...
More dependent projects than I realized.
This reverts commit 4573a7194d
Change-Id: I53cfbc5cf5ef4436f5fa0c8b1ceb6296797e32fe
2012-09-04 12:26:21 -07:00
Eino-Ville Talvala
c07123b1ef
Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
2012-09-04 12:25:18 -07:00
Eino-Ville Talvala
28125f96a8
am 4604e30d: Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage." into jb-mr1-dev
...
* commit '4604e30da0ecf47232ff7fe74bd4c11363f3f35f':
Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.
2012-09-04 12:09:58 -07:00
Eino-Ville Talvala
4604e30da0
Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage." into jb-mr1-dev
2012-09-04 12:07:25 -07:00
Dianne Hackborn
a80e74b710
am dbb1e6af: Fix some more.
...
* commit 'dbb1e6af7fc82ac5f615e46ddaa93ba1ee7c0094':
Fix some more.
2012-09-04 11:25:08 -07:00
Dianne Hackborn
dbb1e6af7f
Fix some more.
...
Change-Id: Ieeba0ba87f65eed25f3a0f23924fc99b90cc1d69
2012-09-04 11:20:29 -07:00
Eino-Ville Talvala
46a65b42aa
EmulatedFakeCamera2: Split AE/AWB mode and lock
...
Bug: 6243944
Change-Id: Ib7d311a04c687358317164f7f711dc293ecc0519
2012-09-04 09:23:21 -07:00
Eino-Ville Talvala
4573a7194d
EmulatedFakeCamera2: Add precapture trigger and reprocess support
...
- Manage the precapture protocol with trigger/AE notifications
- Support reprocessing from opaque format to JPEG
- Add a bit of exposure variation to scene
Bug: 6243944
Change-Id: Ic88f8f0ea641ddaf3e921849caf79dd3838665f8
2012-09-04 09:23:21 -07:00
Eino-Ville Talvala
a84522d2f3
Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.
...
This is needed for passing buffers to the camera HAL for reprocessing.
Bug: 6243944
Change-Id: Ibf8d15aead571ddb3b62674cf7afe0d508ca24e7
2012-09-04 09:23:17 -07:00
The Android Automerger
12ea2946b9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-03 06:33:28 -07:00
Brett Chabot
7454171f17
Coverage and unbundling changes for runtest.
...
Stop using 'adb sync' in runtest. It was unreliable even when working
with full platform builds, and doesn't work at all for unbundled apps.
Instead, use output from build command to find produced artifacts and
use 'adb install' where possible.
However, note that this approach won't sync previously built artifacts
to device.
Also adjust to build system support for code coverage. Its no longer
required to build libcore to get code coverage.
Change-Id: I9c5d37897c9570d2d29db3ec82f5c53e60a8f485
2012-08-31 18:55:15 -07:00
Jeff Brown
d71b8c142c
am 2e1fe78f: Add new sample for Presentation API.
...
* commit '2e1fe78fbf01a1e6f454df0f4065410cbbc868bd':
Add new sample for Presentation API.
2012-08-31 15:52:09 -07:00
Jeff Brown
2e1fe78fbf
Add new sample for Presentation API.
...
Change-Id: Ia31deb9ca6ad9a4db1dd6f852c00fa9a94caa4c3
2012-08-31 15:22:34 -07:00
Xavier Ducrohet
c4a1b250a6
am 341b0892: am df56d27b: (-s ours) am b1b6735c: Prepare for JB SDK rev 3
...
* commit '341b0892b74c3a1373326b428e0b3ba6fbdaa84d':
Prepare for JB SDK rev 3
2012-08-30 17:17:28 -07:00
Xavier Ducrohet
341b0892b7
am df56d27b: (-s ours) am b1b6735c: Prepare for JB SDK rev 3
...
* commit 'df56d27bea7c1f03d26b9c9837126bfe0f47e04e':
Prepare for JB SDK rev 3
2012-08-30 17:15:57 -07:00
Xavier Ducrohet
df56d27bea
am b1b6735c: Prepare for JB SDK rev 3
...
* commit 'b1b6735cd69121589bc9bdebb3f8967dc978166b':
Prepare for JB SDK rev 3
2012-08-30 16:06:25 -07:00
Eino-Ville Talvala
2cb5c238cc
am cbb1d726: Merge "EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED" into jb-mr1-dev
...
* commit 'cbb1d726c6dd79b20819f6f64cc1f48cd2e1fc0d':
EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
2012-08-30 09:40:20 -07:00
Eino-Ville Talvala
cbb1d726c6
Merge "EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED" into jb-mr1-dev
2012-08-30 09:38:38 -07:00
Andrew Hsieh
a6dd6531ed
am bcb736ac: am bef6ec84: am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit 'bcb736acf8d7d2c40dd50f0a50d3fef9c4e23eef':
Replace deprecated APIs in NDK samples
2012-08-30 08:29:10 -07:00
Andrew Hsieh
bcb736acf8
am bef6ec84: am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit 'bef6ec841ec7358dc09d564f0e38a9cb9f933293':
Replace deprecated APIs in NDK samples
2012-08-30 08:26:48 -07:00
Andrew Hsieh
bef6ec841e
am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit '3bc200de51c0afc6f954aaba5d029e1fb4d115e7':
Replace deprecated APIs in NDK samples
2012-08-30 08:25:04 -07:00
Andrew Hsieh
3bc200de51
am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit '9864b8803782378159761424dee2270a12833872':
Replace deprecated APIs in NDK samples
2012-08-30 08:23:48 -07:00
Andrew Hsieh
9864b88037
Merge "Replace deprecated APIs in NDK samples"
2012-08-30 08:17:05 -07:00