LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,720 Commits 2 Branches 0 Tags
ff3d4bc42b22093695896bc319c59b139aa2c6f6
Commit Graph

4720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
ff3d4bc42b resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp 
Change-Id: I05bf91403b3160ff6db7b9a60b3c1c5f1ded0c5b
 2011-03-11 12:59:56 -08:00
David 'Digit' Turner
5ac5e8d7b5 Merge "ndk: Fix stdint.h definitions for C++" 2011-03-11 09:32:54 -08:00
David 'Digit' Turner
c7d8870875 ndk: Fix stdint.h definitions for C++ 
Fix the stdint.h header for C++ inclusion. The limit and constant related macros
should only be defined if __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS are
defined, respectively.

Change-Id: I85b00ed857f40b9c17d530f1405f0f098c5f10f3
 2011-03-11 14:42:12 +01:00
Ying Wang
1a6a849bcb Disable ccache when use mingw. 
Change-Id: Ieff363f9c4433bba53d1e94a25477c60933666e2
 2011-03-10 18:25:51 -08:00
David 'Digit' Turner
9e17cec235 Merge "ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition." 2011-03-10 01:26:39 -08:00
David 'Digit' Turner
114db2a1c4 ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition. 
This is a fix for http://code.google.com/p/android/issues/detail?id=15306

Also see https://review.source.android.com//#change,21699 for the corresponding
fix in the C library headers.

Change-Id: I1c46ee9fc7eb120a98f47719a0407b81001f5ac0
 2011-03-10 10:24:52 +01:00
Brad Fitzpatrick
6ecf30f2d8 Merge "Fix SpareParts crash going into battery stats." 2011-03-04 13:50:59 -08:00
Brad Fitzpatrick
8832d812d5 Fix SpareParts crash going into battery stats. 
Change-Id: Ib158b811c291285660be6fb35ec0f75c429fcea4
http://code.google.com/p/android/issues/detail?id=14898
 2011-03-01 10:23:05 -08:00
David Turner
0b80c5e83c am d2454506: Merge "Move files to proper location in development/ndk/platforms" 
* commit 'd24545065acbacc7e9f1482f08013a4046640ad7':
  Move files to proper location in development/ndk/platforms
 2011-02-28 09:13:43 -08:00
David Turner
d24545065a Merge "Move files to proper location in development/ndk/platforms" 2011-02-28 08:51:38 -08:00
Xavier Ducrohet
87be2fd3fd am e0d1a9bc: Merge "Line Wrapping General settings Set "Never join already wrapped lines" to true." 
* commit 'e0d1a9bcc3279694c57ad273c94ed4975c317797':
  Line Wrapping General settings Set "Never join already wrapped lines" to true.
 2011-02-17 11:40:49 -08:00
Xavier Ducrohet
1f4c4d0b2e am b430ba25: Merge "Blank Lines within class declarations Set "Before field declarations" value to 0." 
* commit 'b430ba2523ab5e60033212eeac0dcd5f79f714a7':
  Blank Lines within class declarations Set "Before field declarations" value to 0.
 2011-02-17 11:40:45 -08:00
Xavier Ducrohet
e0d1a9bcc3 Merge "Line Wrapping General settings Set "Never join already wrapped lines" to true." 2011-02-15 16:56:13 -08:00
Keiji Ariyama
5b78a1d5bd Line Wrapping General settings 
Set "Never join already wrapped lines" to true.

Change-Id: Ia7d3f3efd1b5cf4715c4738db1e56e2512ef4d27
 2011-02-16 09:04:11 +09:00
Xavier Ducrohet
b430ba2523 Merge "Blank Lines within class declarations Set "Before field declarations" value to 0." 2011-02-15 15:29:08 -08:00
Bruce Beare
a9b5a9d315 Move files to proper location in development/ndk/platforms 
Change-Id: I1b001e7b8c878bfc7213556f19c6812d64d46ef3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2011-02-09 08:58:48 -08:00
Raphael
bb0f61d73d am 5eafc91a: Merge "merge "SDK: make \'mkstub\' less verbose." from HC. Do not merge." into gingerbread 
* commit '5eafc91ad3216561d2287f327580644fb1e04cfb':
  merge "SDK: make 'mkstub' less verbose." from HC. Do not merge.
 2011-02-04 14:49:19 -08:00
Raphael
5eafc91ad3 Merge "merge "SDK: make 'mkstub' less verbose." from HC. Do not merge." into gingerbread 2011-02-04 14:46:24 -08:00
Xavier Ducrohet
b82c8fad3d am 1cedfdb0: Update samples API level. DO NOT MERGE 
* commit '1cedfdb031685dd1376de4063d75fb5b8df04eb6':
  Update samples API level. DO NOT MERGE
 2011-02-04 12:52:42 -08:00
Raphael
b82fbc6442 merge "SDK: make 'mkstub' less verbose." from HC. Do not merge. 
mkstub is the tool used to stub the google_apis maps.jar.
Since we're integrating it in the build, we want to control its verbosity.

Change-Id: I93d7dc6a63426affac008f8ef367a0d79277b59a
 2011-02-04 12:35:17 -08:00
Xavier Ducrohet
1cedfdb031 Update samples API level. DO NOT MERGE 
Change-Id: Ib6a27e5abcb7cb767dae31c67445b450705ae9af
 2011-02-04 12:27:11 -08:00
Raphael
ad402d2b1f resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp 
Change-Id: I02a991cfb35d3cd14bd45eee1c3454e5a9c4600b
 2011-02-03 11:30:41 -08:00
Raphael
27caad9905 am 343c626a: am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK." 
* commit '343c626adaaf323f13d3d0796cf4c84455496a96':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-03 09:05:11 -08:00
Raphael
d30ec22e43 am 04bb65e7: Merge "SDK: fix win-sdk build errors, make future errors fatal." 
* commit '04bb65e7c4cd42ce50fa534807c973dba6cb2720':
  SDK: fix win-sdk build errors, make future errors fatal.
 2011-02-03 08:56:31 -08:00
Raphael
343c626ada am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK." 
* commit 'b0e81c371883a8f7f2cfa9a01f8b65d4a2423dcf':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-03 08:56:28 -08:00
Raphael
04bb65e7c4 Merge "SDK: fix win-sdk build errors, make future errors fatal." 2011-02-02 13:41:24 -08:00
Raphael
b0e81c3718 Merge "SDK: Strip llvm-rs-cc in Windows SDK." 2011-02-02 13:41:09 -08:00
Raphael
cedf2ba818 SDK: fix win-sdk build errors, make future errors fatal. 
Firs this fixes a cp/rm errors that were logged when building the Windows SDK.
There errors happens because the secondary sdk/tools/patch_windows_sdk.sh
was run twice.

Next the shell script is changed to make any error fatal and actually
break the build, like it should.

In the makefile, merge Ying's fix to correctly pass showcommands.

Change-Id: I97bbe46d705c6683e31bb701222efe6f9da71d70
 2011-02-02 11:35:41 -08:00
Raphael
d38c76bdf0 SDK: Strip llvm-rs-cc in Windows SDK. 
SDK Bug: 3394374

Change-Id: I46ca70a674da28f265f977a267f81039afe3de7c
 2011-02-02 11:35:24 -08:00
David 'Digit' Turner
442064f4a9 am fd2d786d: am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 
* commit 'fd2d786dd10efc9bf3ce0f5f21fbf80f617286a1':
  native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
 2011-02-02 09:53:15 -08:00
David 'Digit' Turner
fd2d786dd1 am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 
* commit '3f33b7b742865e0c89e49fd7eb917232c2610a70':
  native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
 2011-02-02 09:42:07 -08:00
David 'Digit' Turner
3f33b7b742 Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 2011-02-02 03:11:30 -08:00
David 'Digit' Turner
95ae335fd5 native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook 
The window field must not be set to NULL in the pre-hook, only the
post-one. See http://code.google.com/p/android/issues/detail?id=14352

Change-Id: Ib6214d47c97766bf4a5e148b6b6707e08366fe36
 2011-02-02 00:54:02 +01:00
Raphael Moll
33d8964ce1 am e3ec8442: am 2fa9bd29: Merge "Revamped CustomLocale for the SDK." 
* commit 'e3ec8442781ac765c760c6096393863a62b6a26d':
  Revamped CustomLocale for the SDK.
 2011-02-01 14:31:29 -08:00
Raphael Moll
e3ec844278 am 2fa9bd29: Merge "Revamped CustomLocale for the SDK." 
* commit '2fa9bd29f6e6c1694e38f547a5d11e01d5189697':
  Revamped CustomLocale for the SDK.
 2011-02-01 14:25:26 -08:00
Raphael Moll
2fa9bd29f6 Merge "Revamped CustomLocale for the SDK." 2011-02-01 14:21:47 -08:00
Nick Pelly
ba29b9b177 am c2860adc: Update sample app for final GB MR API changes. 
* commit 'c2860adcb8c8c84927bfe17fadd61b5beea61ae4':
  Update sample app for final GB MR API changes.
 2011-02-01 10:11:04 -08:00
Nick Pelly
c2860adcb8 Update sample app for final GB MR API changes. 
Change-Id: Ic6b7aa2ffe88f6a9228322d41a2be391eb5bf545
 2011-02-01 08:25:46 -08:00
Keiji Ariyama
a9cf6c0596 Blank Lines within class declarations 
Set "Before field declarations" value to 0.

Change-Id: I8a8d90af8f1e87b60b99d9037684a9aeb1ee0bb9
 2011-02-01 15:12:37 +09:00
Raphael Moll
bc6fa8a82b Revamped CustomLocale for the SDK. 
- Revamped the list UI: replaced the long-press actions by
some stateful buttons. Uses the listview's single choice mode.

- Added a broadcast receiver to be able to change the system
locale using an intent, e.g. sent by adb shell am. This is
convenient for automated testing scripts.

- Changed package namespace to v2. This makes it easier for
an automated testing script to figure that an emulator has the
old version and install the new one side-by-side.

Change-Id: I1849d2b9d55441490b013cfefcca5d8fa48e22bd
 2011-01-31 15:22:56 -08:00
Jean-Baptiste Queru
8efcfb5dd0 am c8fd87e4: Delete browserplugin sample. do not merge 
* commit 'c8fd87e47685146e2c9b32b4f0bdfa3bb724081b':
  Delete browserplugin sample. do not merge
 2011-01-29 08:00:48 -08:00
Jean-Baptiste Queru
c8fd87e476 Delete browserplugin sample. do not merge 
It doesn't build in all environments.

Change-Id: I96fbb28e1bea44656ff6cfb9002eedfd5471612e
 2011-01-29 07:38:51 -08:00
Raphael
6a691b3ed8 resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp 
Change-Id: I6c2ea537a9f6dce3c5d54b8c3c720b49058fea68
 2011-01-27 21:46:19 -08:00
Jean-Baptiste Queru
b35e113cef am 2d81c413: am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge" 
* commit '2d81c413c7b0a1206aae4e45d6dd2bbae0584436':
  Delete browserplugin sample. do not merge
 2011-01-27 15:08:13 -08:00
Jean-Baptiste Queru
2d81c413c7 am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge" 
* commit 'd9af3ac3e2f9f61d541e5c15c3d47bd8e0e6def5':
  Delete browserplugin sample. do not merge
 2011-01-27 15:04:57 -08:00
Jean-Baptiste Queru
d9af3ac3e2 Merge "Delete browserplugin sample. do not merge" 2011-01-27 14:42:23 -08:00
Raphael
1adaa57108 unix2dos command, used by win SDK, has been renamed under Lucid. 
Note: this fix was already in master.

Change-Id: I7935093ef4a01181f7239e9aeeef4792ee0b54cc
 2011-01-27 14:00:21 -08:00
Jean-Baptiste Queru
dede009a98 Delete browserplugin sample. do not merge 
It doesn't build in all environments.

Change-Id: Ib27b73a0f74a79e4138bb128f643206e37f5ea60
 2011-01-27 13:35:26 -08:00
Xavier Ducrohet
f356961278 am 82be0899: Update platform version for SDK component. DO NOT MERGE. 
* commit '82be08990bc73134ae8b0e2a7e94e2a28a82d675':
  Update platform version for SDK component. DO NOT MERGE.
 2011-01-27 13:26:06 -08:00
Xavier Ducrohet
82be08990b Update platform version for SDK component. DO NOT MERGE. 
Change-Id: I29b8e2345c3c5637839099adf3433e784992e8bb
 2011-01-27 10:34:25 -08:00