OSDN Git Service
The Android Automerger [Sat, 13 Apr 2013 01:15:42 +0000 (18:15 -0700)]
JWR11G
The Android Automerger [Fri, 12 Apr 2013 23:20:46 +0000 (16:20 -0700)]
JWR11F
The Android Automerger [Fri, 12 Apr 2013 21:32:07 +0000 (14:32 -0700)]
JWR11E
The Android Automerger [Fri, 12 Apr 2013 18:30:53 +0000 (11:30 -0700)]
JWR11D
The Android Automerger [Fri, 12 Apr 2013 06:22:16 +0000 (23:22 -0700)]
"JWR11C"
The Android Automerger [Thu, 11 Apr 2013 21:44:38 +0000 (14:44 -0700)]
JWR11B
The Android Automerger [Thu, 11 Apr 2013 12:57:18 +0000 (05:57 -0700)]
"JWR11"
The Android Automerger [Thu, 11 Apr 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Thu, 11 Apr 2013 02:17:41 +0000 (19:17 -0700)]
Support to dist unbundled files for bundled build
Usage:
LOCAL_DIST_BUNDLED_BINARIES := true
The dist files will include the jni shared libraries and the apk with
jni libraries stripped.
Bug:
8181626
Change-Id: I4a047d786ad35b948b4ad7a51adf37321dbe395c
The Android Automerger [Thu, 11 Apr 2013 02:07:13 +0000 (19:07 -0700)]
JWR10C
Ying Wang [Wed, 10 Apr 2013 22:11:43 +0000 (22:11 +0000)]
Revert "Get rid of the liblog hack."
This reverts commit
7636578729ffcd02bfb5158db884f559a52d8905
Change-Id: I32f2acce5f99cb97eae986dfeba6d5d25378aefa
The Android Automerger [Wed, 10 Apr 2013 19:18:38 +0000 (12:18 -0700)]
JWR10B
The Android Automerger [Wed, 10 Apr 2013 12:57:46 +0000 (05:57 -0700)]
"JWR10"
The Android Automerger [Wed, 10 Apr 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 06:27:57 +0000 (23:27 -0700)]
Get rid of the liblog hack.
Bug:
8580410
Change-Id: I4b437d10522ee66c7883faacfaf7e30abede394c
Ying Wang [Wed, 10 Apr 2013 05:33:58 +0000 (22:33 -0700)]
Add liblog
Bug:
8580410
Change-Id: Id3c26ff084950f8cbfa87f4425747ee322de7624
Ying Wang [Wed, 10 Apr 2013 05:32:37 +0000 (05:32 +0000)]
Merge "Revert "Add liblog"" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:32:21 +0000 (05:32 +0000)]
Revert "Add liblog"
This reverts commit
8722580d90840352883a84d1ca882e50220f3959
Change-Id: Iafdbb7f540a53ddc9dc2e21c0afddb62c44c4af8
Ying Wang [Wed, 10 Apr 2013 05:12:00 +0000 (05:12 +0000)]
Merge "Add liblog" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 04:41:48 +0000 (21:41 -0700)]
Add liblog
Bug:
8580410
Change-Id: I45e17b786b8d221a071b5de2432bb1367e245fb4
The Android Automerger [Tue, 9 Apr 2013 23:00:25 +0000 (16:00 -0700)]
JWR09C
Robert Ly [Tue, 9 Apr 2013 20:43:50 +0000 (13:43 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:40:36 +0000 (13:40 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:37:01 +0000 (13:37 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:33:28 +0000 (13:33 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:29:57 +0000 (13:29 -0700)]
am
a4d2d0ef: s.a.c templates
* commit '
a4d2d0ef551f443445a1dffb05f530de32b01fb3':
s.a.c templates
Robert Ly [Tue, 9 Apr 2013 18:26:12 +0000 (11:26 -0700)]
s.a.c templates
Change-Id: Ia6554ba55d10af10227cde336026b51a27307aa0
The Android Automerger [Tue, 9 Apr 2013 17:05:04 +0000 (10:05 -0700)]
JWR09B
The Android Automerger [Tue, 9 Apr 2013 12:57:13 +0000 (05:57 -0700)]
"JWR09"
The Android Automerger [Tue, 9 Apr 2013 12:55:14 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 9 Apr 2013 01:53:50 +0000 (18:53 -0700)]
JWR08B
Dianne Hackborn [Mon, 8 Apr 2013 22:35:34 +0000 (22:35 +0000)]
Merge "Add new media command to build." into jb-mr2-dev
The Android Automerger [Mon, 8 Apr 2013 12:58:37 +0000 (05:58 -0700)]
"JWR08"
The Android Automerger [Mon, 8 Apr 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Sat, 6 Apr 2013 01:51:32 +0000 (18:51 -0700)]
Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
Ying Wang [Sat, 6 Apr 2013 01:02:16 +0000 (18:02 -0700)]
Switch to prebuilt bison
Bug:
8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
Dianne Hackborn [Fri, 5 Apr 2013 01:50:45 +0000 (18:50 -0700)]
Add new media command to build.
Change-Id: I3c32924b0c6400aa22221646f8e118a66f65f628
The Android Automerger [Fri, 5 Apr 2013 22:14:45 +0000 (15:14 -0700)]
JWR04C
The Android Automerger [Thu, 4 Apr 2013 23:25:30 +0000 (16:25 -0700)]
JWR04B
The Android Automerger [Thu, 4 Apr 2013 12:57:18 +0000 (05:57 -0700)]
"JWR04"
The Android Automerger [Thu, 4 Apr 2013 12:55:10 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 4 Apr 2013 00:02:56 +0000 (17:02 -0700)]
JWR03B
Robert Ly [Wed, 3 Apr 2013 21:01:54 +0000 (14:01 -0700)]
am
f3840a2c: am
99532a5a: am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
f3840a2c2c614a271c8678fb65fc4a6148f41744':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:58:38 +0000 (13:58 -0700)]
am
99532a5a: am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
99532a5aeabe3d55fa99407e948782a6dcf15e5e':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:56:04 +0000 (13:56 -0700)]
am
ad027032: am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
ad027032b11f592cc58286f535e087053b0220f0':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:54:00 +0000 (13:54 -0700)]
am
e046ede5: am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
e046ede5350affd49268d35692b5142d1471381d':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:52:06 +0000 (13:52 -0700)]
am
3eba74ff: am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
3eba74ffc1f2a542a0d0376215fb6d2711e7639c':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:48:35 +0000 (13:48 -0700)]
am
ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit '
ddde20b67c521fbd7ad090f7a1e4ab3f69865b4f':
fix android build number in footer of gms and gcm reference
Robert Ly [Wed, 3 Apr 2013 20:38:55 +0000 (20:38 +0000)]
Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
Ulas Kirazci [Thu, 28 Mar 2013 21:02:14 +0000 (14:02 -0700)]
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
The Android Automerger [Wed, 3 Apr 2013 13:03:57 +0000 (06:03 -0700)]
"JWR03"
The Android Automerger [Wed, 3 Apr 2013 13:02:06 +0000 (06:02 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 2 Apr 2013 23:55:26 +0000 (16:55 -0700)]
JWR02B
Scott Main [Tue, 2 Apr 2013 20:55:59 +0000 (13:55 -0700)]
am
baa0023b: am
2e5602cd: am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is
* commit '
baa0023b9f1e5cbc3cfa0c39ea5893cd68d5a981':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:51:52 +0000 (13:51 -0700)]
am
2e5602cd: am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into n
* commit '
2e5602cd6251d7669f5adc9ccda3a5451a0195bd':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:47:47 +0000 (13:47 -0700)]
am
70174c67: am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '
70174c6783f85d105157f2b2207a3d459e966237':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:44:22 +0000 (13:44 -0700)]
am
07e13f7c: am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '
07e13f7c25d22ac30a59b10feebf92a3d2df6e02':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Scott Main [Tue, 2 Apr 2013 20:40:05 +0000 (13:40 -0700)]
am
f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
* commit '
f614554daed6b8fe1ff646136a28c8090474b39e':
load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
Ben Murdoch [Tue, 2 Apr 2013 17:20:10 +0000 (18:20 +0100)]
Fix SDK build.
Ensure that we include the Chromium-WebView resources.
Change-Id: I3f7b4e52ebb59fa6a8952839bb071c7994505b75
The Android Automerger [Tue, 2 Apr 2013 16:19:59 +0000 (09:19 -0700)]
"JWR02"
The Android Automerger [Tue, 2 Apr 2013 16:18:12 +0000 (09:18 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Scott Main [Mon, 1 Apr 2013 23:38:11 +0000 (16:38 -0700)]
load google API navtree ondemand (remove request from <head>).
Also move the code for highlighting the sidenav into a separate method
that we can call at a later time, such as after the gms reference is loaded into nav.
Change-Id: I924d68b2b9dbfed83f81d1fd418e06b6c79a9010
The Android Automerger [Mon, 1 Apr 2013 23:29:47 +0000 (16:29 -0700)]
JWR01B
Jeff Brown [Mon, 1 Apr 2013 20:40:55 +0000 (13:40 -0700)]
apicheck: Suppress certain changes in final qualifier.
It is safe for a class to become final if it was not previously
instantiable since applications could not declare subclasses
of their own.
Likewise it is always safe to remove final.
Change-Id: I9a72fee7b25ccceca2024112812b97872ba2ec6b
Ying Wang [Mon, 1 Apr 2013 19:00:13 +0000 (19:00 +0000)]
Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
The Android Automerger [Mon, 1 Apr 2013 12:57:34 +0000 (05:57 -0700)]
JWR01
The Android Automerger [Mon, 1 Apr 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 29 Mar 2013 23:18:48 +0000 (16:18 -0700)]
JWQ87E
The Android Automerger [Fri, 29 Mar 2013 21:03:26 +0000 (14:03 -0700)]
JWQ87D
Raph Levien [Fri, 29 Mar 2013 17:43:08 +0000 (17:43 +0000)]
Merge "Switch Indic fonts to Noto" into jb-mr2-dev
Raph Levien [Fri, 29 Mar 2013 17:22:31 +0000 (10:22 -0700)]
Switch Indic fonts to Noto
This patch changes the fonts actually installed on the device from
the older cibu and lohit fonts to the new noto ones. Note that the
decision of whether to include the fonts based on device profile
is in the fonts.mk of the individual font projects.
Change-Id: I8b9dced0cf5bef3f8a011f925c263c346f49e407
The Android Automerger [Fri, 29 Mar 2013 00:28:35 +0000 (17:28 -0700)]
JWQ87C
keunyoung [Fri, 29 Mar 2013 00:11:22 +0000 (00:11 +0000)]
Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
The Android Automerger [Thu, 28 Mar 2013 22:46:28 +0000 (15:46 -0700)]
JWQ87B
keunyoung [Thu, 28 Mar 2013 21:08:31 +0000 (14:08 -0700)]
find pdk platform.zip from full_ directory as well for aosp_ products
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
Devin Kim [Mon, 4 Feb 2013 20:24:44 +0000 (12:24 -0800)]
Do not disable factory build under PDK
This is related to commit a1712e.
Some PDKs need the factory build under PDK. If you want to disable the factory
build under PDK, use TARGET_NO_FACTORY in your device's BoardConfig.mk
Change-Id: I5e208836918ffd737951d3fb1f54c560d2b93641
The Android Automerger [Thu, 28 Mar 2013 12:57:57 +0000 (05:57 -0700)]
JWQ87
The Android Automerger [Thu, 28 Mar 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Brian Carlstrom [Thu, 28 Mar 2013 00:11:20 +0000 (00:11 +0000)]
Merge "resolved conflicts for merge of
9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
Brian Carlstrom [Thu, 28 Mar 2013 00:04:05 +0000 (17:04 -0700)]
resolved conflicts for merge of
9a3b17d1 to jb-mr2-dev
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
Stephen Hines [Wed, 27 Mar 2013 23:59:29 +0000 (23:59 +0000)]
Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
Stephen Hines [Wed, 27 Mar 2013 23:51:38 +0000 (16:51 -0700)]
Link RS compatibility files with libc and make bcc_compat a regular dep.
If we don't do "-lc", we end up missing symbols like "memset" on our non-NEON
builds. It also makes more sense to have bcc_compat as a standard dependency
for now, since it occasionally changes the way we compile/link our source
files.
Change-Id: I4b0ead66caa7c72fb7733db8804a33faa5350930
Brian Carlstrom [Wed, 27 Mar 2013 23:40:25 +0000 (16:40 -0700)]
am
923ac1a8: Merge "Added local variable info output to javac command for host build."
* commit '
923ac1a8717f38f116708c259b8d75bc303abd5a':
Added local variable info output to javac command for host build.
The Android Automerger [Wed, 27 Mar 2013 23:22:58 +0000 (16:22 -0700)]
JWQ86C
Scott Main [Wed, 27 Mar 2013 23:12:22 +0000 (16:12 -0700)]
am
6c3f41ac: am
a6188a56: am
972c3798: am
28ca0f32: am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
6c3f41ac7cf51c0a3405296853b075f929e07397':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
The Android Automerger [Wed, 27 Mar 2013 23:10:32 +0000 (16:10 -0700)]
JWQ86B
Scott Main [Wed, 27 Mar 2013 23:10:10 +0000 (16:10 -0700)]
am
a6188a56: am
972c3798: am
28ca0f32: am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
a6188a56ea8f10a3ce81fb95fbf508cae688c4b1':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 23:07:57 +0000 (16:07 -0700)]
am
972c3798: am
28ca0f32: am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
972c3798890f8b0e20005eece62ee88f508dd761':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 23:05:56 +0000 (16:05 -0700)]
am
28ca0f32: am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
28ca0f324454faa3c6d40331ecb3abb1c1a13d74':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 23:03:55 +0000 (16:03 -0700)]
am
25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '
25e7300c2499d0ecaad91aecc3fbf988c59fc7da':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Scott Main [Wed, 27 Mar 2013 22:24:06 +0000 (15:24 -0700)]
load the navtree javascript on demand; don't try setting up the tree until it's loaded
Change-Id: I1f209869a17099dd853a2f4cae766481a6cd03eb
Brian Carlstrom [Wed, 27 Mar 2013 22:44:30 +0000 (22:44 +0000)]
Merge "Added local variable info output to javac command for host build."
The Android Automerger [Wed, 27 Mar 2013 12:57:57 +0000 (05:57 -0700)]
JWQ86
The Android Automerger [Wed, 27 Mar 2013 12:55:24 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
jeffhao [Tue, 17 Apr 2012 23:24:33 +0000 (16:24 -0700)]
Added local variable info output to javac command for host build.
The host java files weren't being compiled with -g.
(cherry-picked from
3a971f734060d19fc023ccf82e39d956a31b7cfb)
Change-Id: I4274910c64ebf52ec955e30e800b34fc309db27b
repo sync [Wed, 27 Mar 2013 00:21:01 +0000 (17:21 -0700)]
Merge commit '
e8c9e82d' into manualmerge
Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675
Geremy Condra [Tue, 26 Mar 2013 23:39:22 +0000 (16:39 -0700)]
am
50585e76: Merge "Add sepolicy and mac_perms to installclean"
* commit '
50585e76fd13eb3d91f8d9e9e7ae5e1a3cd1ae86':
Add sepolicy and mac_perms to installclean
Ying Wang [Tue, 26 Mar 2013 23:01:02 +0000 (16:01 -0700)]
Default install path of shared Java library with tag tests
To $(PRODUCT_OUT)/data/framework/.
Change-Id: Iff6bbada47258344c13853d4fd71c7ad4b709c2c
Geremy Condra [Tue, 26 Mar 2013 22:35:50 +0000 (22:35 +0000)]
Merge "Add sepolicy and mac_perms to installclean"
William Roberts [Tue, 26 Mar 2013 21:51:18 +0000 (14:51 -0700)]
Add sepolicy and mac_perms to installclean
Remove the output files for SELinux policy
and mac_permissions.xml mapping for changes
between user and eng build.
Change-Id: Ie27dcedde0c22ce917d90466a763698c86919530