LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,419 Commits 2 Branches 0 Tags
ebcfd936e66a3404fe442d9eed9ba41d3b908e2c
Commit Graph

8419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
1cedfdb031 Update samples API level. DO NOT MERGE 
Change-Id: Ib6a27e5abcb7cb767dae31c67445b450705ae9af
 2011-02-04 12:27:11 -08:00
The Android Automerger
683af6bcf7 merge in honeycomb-release history after reset to honeycomb 2011-02-04 11:49:00 -08:00
Raphael
58d2cfd206 am 8252cdea: SDK: make \'mkstub\' less verbose. 
* commit '8252cdea30a5a22ae8b2235d7dee2fdd02ba5ccd':
  SDK: make 'mkstub' less verbose.
 2011-02-04 11:10:22 -08:00
The Android Automerger
a784e3fdd5 merge in honeycomb-release history after reset to honeycomb 2011-02-04 10:25:53 -08:00
Peter Visontay
230f8b71a0 Added the ApplicationsProvider's tests to test_defs.xml. 
Dependent on change Ib6d9a81f3bfa68cbd25d2189f6e6690bc3d8e428
(which adds the necessary test size annotations).

Bug: 1847330
Change-Id: I206385e5da7f2c496043568cba848304b52a6475
 2011-02-04 15:31:43 +00:00
The Android Automerger
31d665fe7f merge in honeycomb-release history after reset to honeycomb 2011-02-04 07:18:35 -08:00
Raphael
8252cdea30 SDK: make 'mkstub' less verbose. 
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: Ic0cfacb79a0aa260bcafb54bdc6bdb5a98b1c87a
 2011-02-03 22:56:14 -08:00
Raphael
d22bcf2a2c am fdb1410e: am ad402d2b: resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp 
* commit 'fdb1410e6c895bbc1a299c249e79a5d38c9fbf7c':
  SDK: fix win-sdk build errors, make future errors fatal.
 2011-02-03 18:07:40 -08:00
Raphael
8c3366529a am a922306a: am 27caad99: am 343c626a: am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK." 
* commit 'a922306a87dea10956d330ed43a5f6b15927854f':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-03 17:18:00 -08:00
The Android Automerger
65485f51d0 merge in honeycomb-release history after reset to honeycomb 2011-02-03 15:26:00 -08:00
The Android Automerger
a7f9cf48c2 merge in gingerbread-release history after reset to gingerbread 2011-02-03 14:23:54 -08:00
Raphael
fdb1410e6c am ad402d2b: resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp 
* commit 'ad402d2b1f4315f31be760d5d2345561059bbe75':
  SDK: fix win-sdk build errors, make future errors fatal.
 2011-02-03 11:34:31 -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
The Android Automerger
dbf1cafcdf merge in honeycomb-release history after reset to honeycomb 2011-02-03 11:22:42 -08:00
Raphael
a922306a87 am 27caad99: am 343c626a: am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK." 
* commit '27caad9905b7346bfb4e93ff98371ecdf7cdf433':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-03 09:16:46 -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
The Android Automerger
34bc93544a merge in honeycomb-release history after reset to honeycomb 2011-02-03 07:16:58 -08:00
The Android Automerger
de88b55780 merge in gingerbread-release history after reset to gingerbread 2011-02-02 18:29:33 -08:00
The Android Automerger
0e45e71cdd merge in gingerbread-release history after reset to gingerbread 2011-02-02 17:44:46 -08:00
Raphael
8daebb877b am 6d5532be: am 7a508aed: SDK: fix win-sdk build errors, make future errors fatal. 
* commit '6d5532beedc1c32c806219c94b26fedb2772377a':
  SDK: fix win-sdk build errors, make future errors fatal.
 2011-02-02 16:20:18 -08:00
Raphael
b703091504 am 83a172e0: am 0e2de35b: SDK: Strip llvm-rs-cc in Windows SDK. 
* commit '83a172e05f07d6c12d3f3657cb7b47190259a2b6':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-02 16:20:15 -08:00
The Android Automerger
15dc692944 merge in honeycomb-release history after reset to honeycomb 2011-02-02 16:12:17 -08:00
Raphael
6d5532beed am 7a508aed: SDK: fix win-sdk build errors, make future errors fatal. 
* commit '7a508aed2ac3fe64b307cf05df9989e41e7f6630':
  SDK: fix win-sdk build errors, make future errors fatal.
 2011-02-02 15:52:38 -08:00
Raphael
83a172e05f am 0e2de35b: SDK: Strip llvm-rs-cc in Windows SDK. 
* commit '0e2de35b07d086bba435cda6c112481c75a47521':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-02 15:52:34 -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
7a508aed2a 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: Iee75e42b0b0bbba3c26858c82c933660dc6d74ae
 2011-02-02 11:52:53 -08:00
Raphael
0e2de35b07 SDK: Strip llvm-rs-cc in Windows SDK. 
SDK Bug: 3394374

Change-Id: I892afdde0672bd5803d25c99e202f2b0418b796d
 2011-02-02 11:52:47 -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
99dbfcccc0 am 8fa01f7d: am 442064f4: am fd2d786d: am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 
* commit '8fa01f7d54c5a8a8036b21428bacd1ea5022bf7f':
  native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
 2011-02-02 09:59:32 -08:00
David 'Digit' Turner
8fa01f7d54 am 442064f4: am fd2d786d: am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 
* commit '442064f4a910bc5c9997e81d451e5721f6e96696':
  native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
 2011-02-02 09:56:15 -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
The Android Automerger
59f6ce82a6 merge in honeycomb-release history after reset to honeycomb 2011-02-02 07:21:21 -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
86ed8b3937 am ae431044: am 33d8964c: am e3ec8442: am 2fa9bd29: Merge "Revamped CustomLocale for the SDK." 
* commit 'ae43104493bfe8271e5b1efc809ae06f8ecea893':
  Revamped CustomLocale for the SDK.
 2011-02-01 14:50:47 -08:00
Raphael Moll
ae43104493 am 33d8964c: am e3ec8442: am 2fa9bd29: Merge "Revamped CustomLocale for the SDK." 
* commit '33d8964ce12e438e70456be368bbbf2702efb05b':
  Revamped CustomLocale for the SDK.
 2011-02-01 14:48:40 -08: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
df327d854c am 1501492c: (-s ours) am f0f3e98f: DO NOT MERGE 
* commit '1501492cfb30aa6f2907661b6240acf8f7a260e1':
  DO NOT MERGE
 2011-02-01 13:27:08 -08:00
Nick Pelly
c7503436df am 52e42d3f: am ba29b9b1: am c2860adc: Update sample app for final GB MR API changes. 
* commit '52e42d3f85ef3f7081e08c42528a2c3a76376c86':
  Update sample app for final GB MR API changes.
 2011-02-01 13:26:55 -08:00
Nick Pelly
1501492cfb am f0f3e98f: DO NOT MERGE 
* commit 'f0f3e98f10846f805657daa69e8d21e5b5717a9f':
  DO NOT MERGE
 2011-02-01 11:50:22 -08:00
Nick Pelly
f0f3e98f10 DO NOT MERGE 
Cherry-pick from GB to HC.

Update sample app for final GB MR API changes.

Change-Id: Iab3b879d1a53b70cbffd51011c77699325e21dad
 2011-02-01 11:16:06 -08:00
Nick Pelly
52e42d3f85 am ba29b9b1: am c2860adc: Update sample app for final GB MR API changes. 
* commit 'ba29b9b17769995d7fba7dea09934d2e11bf5ffb':
  Update sample app for final GB MR API changes.
 2011-02-01 10:22:12 -08:00
The Android Automerger
c315bf8583 merge in honeycomb-release history after reset to honeycomb 2011-02-01 10:11:45 -08:00