LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,402 Commits 2 Branches 0 Tags
08f4a2848e4d546b699e68adc268e9ea9701c88a
Commit Graph

9402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Lockwood
9a0d40c2f0 Merge remote-tracking branch 'goog/ics-aah-exp' 2012-03-21 15:30:52 -07:00
Mike Lockwood
ffc002ef30 Merge commit 'fb11862390f6468a24a3a7aef57ffcfc0f5a3290' 
Merge "Increase default runtest -j to 16." into ics-aah

Change-Id: I150ea819617fcfa0e60d14e758d002849718dda2
 2012-03-21 15:30:25 -07:00
Mike Lockwood
825502444a Merge commit '12db436d227ad9b97cb3d13812e1175cf9be8ed6' 
Increase default runtest -j to 16.

Change-Id: I17adc7c585559ffbd6612b6bf9276cb3c5131f83
 2012-03-21 15:29:52 -07:00
Mike Lockwood
055c2bd689 Merge commit '7eef71a24c991ceb5f1522f067c2f559a356a5a4' 
empty merge:
git merge -s ours 7eef71a24c

Change-Id: I4140c9bb107490edba6f0643d0d22a25d500a71c
 2012-03-21 15:28:35 -07:00
Andrew Hsieh
206ea399b5 Refactor with ToTargetCompatibleHandle() 
Refactor statements doing host-to-target handle conversion, eg.

   uintptr_t hndlptr = (uintptr_t)hostHandle;
   unsigned int hndl = (unsigned int)hndlptr;
   assert(sizeof(hndl) == sizeof(hndlptr) || hndl == hndlptr);

into a call to ToTargetCompatibleHandle()

Change-Id: I0bcfb37f1b50679d29e7f21fe230ad433fbbef7c
 2012-03-22 01:27:44 +08:00
The Android Open Source Project
b24c0b214d am e8e95757: am 9bb6dd28: Reconcile with ics-mr1-release 
* commit 'e8e957575c0d96e9fb0544f3851ca42e592a960d':
 2012-03-21 09:05:54 -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
01c4b7e626 am 34f1e014: am cbd78651: Reconcile with ics-mr1-release 
* commit '34f1e01412c2f35d32181f0b6ad64e35cf63ef0a':
 2012-03-21 08:27:30 -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
Amith Yamasani
a277cee31d Package control per user 
Change-Id: Ife6c3b223c382ca680b5fcf9b71213d0460c95b7
 2012-03-20 11:48:16 -07:00
Vladimir Chtchetkine
8385e714a7 Merge "Change camera HAL to catch up with changes in emulator." 2012-03-20 11:42:08 -07:00
Andrew Hsieh
f9e6097f2f Fixed inconsistent minSdkVersion and target= in NDK samples 
Also removed Dummy.java and auto-gen files
Inspired by http://code.google.com/p/android/issues/detail?id=20017

Change-Id: I5a59c86b8b85c15eccca3b3157459b70a4815684
 2012-03-20 14:37:17 +08:00
Dianne Hackborn
967d1e6caf Update animation sample to use new activity options API. 
Change-Id: Id73663f1e5f159c5b073cd9c074501958ca5a81f
 2012-03-19 17:50:03 -07:00
Vladimir Chtchetkine
c9d6edeea5 Change camera HAL to catch up with changes in emulator. 
Emulator now allows fake camera to emulate both, back and front cameras at the same time.
Camera HAL is changed in this CL in order to support this.

Change-Id: I4dcf2d569bb0c6a3800b4a8da5edd4777b5a078a
 2012-03-19 13:34:28 -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
a7398d4c43 am cd6962c8: (-s ours) am 9c583814: am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 
* commit 'cd6962c8b825db61c2cb1661f8aeed74221d2530':
 2012-03-16 09:49:22 -07:00
Xavier Ducrohet
e87f12da3e am 48a4de8c: (-s ours) am 024201a3: am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 
* commit '48a4de8c849c66ae6f870ac426e4ee905029400b':
  Add eclipse+readme files to prebuilt of v7-grid. do not merge.
 2012-03-16 09:47:18 -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
e0b4478948 am a774a84d: (-s ours) am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 
* commit 'a774a84d8ce389cc7db3736b55c7adbed43d014c':
  Add eclipse+readme files to prebuilt of v7-grid. do not merge.
 2012-03-16 09:45:11 -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
a774a84d8c 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:48 -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
Raghu Gandham
c06e37eb51 ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and 
INT_MIN. Without this fix, the following lines will fail when configuring
gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)

    #define  WCHAR_MAX   INT_MAX
    #define  WCHAR_MIN   INT_MIN

Change-Id: Ifa87cf011cf7068c48755fc9ce5c0d73e95ef2dc
Signed-off-by: Chao-Ying Fu <fu@mips.com>
 2012-03-15 17:24:23 -07:00
Robert Ly
bdbb021a70 am 9ef633a0: am 38eb1f7f: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1 
* commit '9ef633a0ffdc33ad8c3b2f0466f405a5b32438ad':
 2012-03-15 11:38:40 -07:00
Robert Ly
9ea82e9931 am 28744c34: am b7875ba1: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1 
* commit '28744c34992d2f8619b08536336d0e1401a9fb56':
  update searchable dictionary for Android U class
 2012-03-15 11:38:39 -07:00
Robert Ly
e444fb9888 am f9398a3a: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1 
* commit 'f9398a3a77abe2c3172629fc7d91bd89bc4a3e80':
  update searchable dictionary for Android U class
 2012-03-14 18:44:26 -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
f9398a3a77 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:10 -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
Dianne Hackborn
51cb3a4dbc Update to follow IActivityManager change. 
Change-Id: I1e02418be7e6c2777662c0b4ba99b7b68c37834a
 2012-03-14 12:57:15 -07:00
Andrew Hsieh
129a0c2963 Merge "Added rules to build 64-bit libraries for 64-bit emulator" 2012-03-14 09:13:15 -07:00
Andrew Hsieh
a3f456f459 Added rules to build 64-bit libraries for 64-bit emulator 
All ten libraries can now be built in 64-bit named "lib64*" (*)
in addition to the original 32-bit form named "lib*".

Also, dlopen "lib64*so" in 64-bit.

(*) eg. In Ubuntu, all can be built with the following command:
  make out/host/linux-x86/lib/lib64OpenglRender.so \
       out/host/linux-x86/lib/lib64EGL_translator.so \
       out/host/linux-x86/lib/lib64GLES_CM_translator.so \
       out/host/linux-x86/lib/lib64GLES_V2_translator.so

Rules to build static libraries lib64log.a, lib64cutils.a and lib64utils.a
they depend were added in other CLs.

Change-Id: I3afb64de6dda1d55dbd1b4443d2dbc78a683b19f
 2012-03-13 22:40:33 -07:00
Robert Ly
7d5b68ca79 update searchable dictionary for Android U class 
Change-Id: Ib214400bae29ab2c4a34500dcf84b415ab13b77c
 2012-03-13 15:23:35 -07:00
James Dong
7803a1db5b Merge "Switched to use header files in /frameworks/native" 2012-03-13 12:44:43 -07:00
Raphael Moll
49d8d82cec am 6f721123: (-s ours) am af574136: Support lib: use /samples directory. do not merge. 
* commit '6f721123f05bf6a8dee29db251a64f19a5d5821e':
  Support lib: use /samples directory. do not merge.
 2012-03-13 11:34:29 -07:00
Andreas Huber
bd7ef3835c Merge "We're configuring media codecs dynamically now." 2012-03-13 09:01:32 -07:00
David 'Digit' Turner
c65cfeb2b2 ndk: <signal.h>: include <asm/sigcontext.h> 
This patch modifies <signal.h>, starting from API level 8,
to include <asm/sigcontext.h>.

It is required to be able to use <signal.h> on a MIPS
platform. See https://android-review.googlesource.com/32281

Change-Id: I720259541fa7e2a4d6a428eae9fd4882c5355c31
 2012-03-13 13:49:02 +01:00
James Dong
27b71c7383 Switched to use header files in /frameworks/native 
o related-to-bug: 6044887

Change-Id: Iea98db35e51aaf52063565818ecfea8a935693f3
 2012-03-12 20:37:02 -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
Siva Velusamy
c8193f2412 Merge "Fix # of arguments to startActivity" 2012-03-12 18:10:44 -07:00