OSDN Git Service
Ying Wang [Thu, 11 Apr 2013 05:09:47 +0000 (22:09 -0700)]
am
3e556091: Support to dist unbundled files for bundled build
* commit '
3e55609134381cadfc3b69657a5598dc3d8f2e35':
Support to dist unbundled files for bundled build
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 Open Source Project [Wed, 10 Apr 2013 22:31:33 +0000 (15:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I7df2e132b28a7491cab9dbb36f64c8058f60a0e9
Ying Wang [Wed, 10 Apr 2013 22:14:23 +0000 (15:14 -0700)]
am
c04a8282: Revert "Get rid of the liblog hack."
* commit '
c04a8282229b624eb3aff506fb72e5fcf27b258f':
Revert "Get rid of the liblog hack."
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
Ying Wang [Wed, 10 Apr 2013 17:09:06 +0000 (10:09 -0700)]
am
76365787: Get rid of the liblog hack.
* commit '
7636578729ffcd02bfb5158db884f559a52d8905':
Get rid of the liblog hack.
The Android Open Source Project [Wed, 10 Apr 2013 17:05:13 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id8df255f1ee96ac589ce42c921ff5098c9507331
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:37:04 +0000 (22:37 -0700)]
Ying Wang [Wed, 10 Apr 2013 05:37:04 +0000 (22:37 -0700)]
am
fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev
* commit '
fd068148d64cabd318a7d426840c5127f7a91160':
Revert "Add liblog"
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:17:07 +0000 (22:17 -0700)]
am
134ec88c: Merge "Add liblog" into jb-mr2-dev
* commit '
134ec88c943ad0453d5716edceacca46a621e026':
Add liblog
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:45:43 +0000 (13:45 -0700)]
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:37:39 +0000 (15:37 -0700)]
am
51ebc822: Merge "Add new media command to build." into jb-mr2-dev
* commit '
51ebc822c1cf7cc206d5a6acc98b8a3f06227426':
Add new media command to build.
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 Open Source Project [Mon, 8 Apr 2013 20:35:34 +0000 (13:35 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic29dadd7db4775b7812868535dd2c510a64f0591
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 04:06:19 +0000 (21:06 -0700)]
am
4996c807: Merge "Fix the win_sdk build."
* commit '
4996c8073e87dd9e361b385d8aeb121f4c36a221':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 04:04:23 +0000 (21:04 -0700)]
resolved conflicts for merge of
2321482e to jb-mr2-dev-plus-aosp
Change-Id: I1b144cdf6774df95c0507cc5751d7def240cf645
Ying Wang [Sat, 6 Apr 2013 02:51:24 +0000 (02:51 +0000)]
Merge "Fix the win_sdk build."
Ying Wang [Sat, 6 Apr 2013 02:51:05 +0000 (02:51 +0000)]
Merge "Switch to prebuilt bison"
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:57:06 +0000 (18:57 -0700)]
am
dd75a03d: Fix the win_sdk build.
* commit '
dd75a03d35499c34db913e886dbed5c37f5ce6d8':
Fix the win_sdk build.
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
Ying Wang [Sat, 6 Apr 2013 01:25:57 +0000 (18:25 -0700)]
am
854be683: Switch to prebuilt bison
* commit '
854be683636892eed455100d0c20b0f7dd8c5076':
Switch to prebuilt bison
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
The Android Open Source Project [Wed, 3 Apr 2013 23:43:07 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If59d4eea208050457ffe142edea2aa28385e3aa3
Brian Carlstrom [Wed, 3 Apr 2013 21:19:26 +0000 (14:19 -0700)]
resolved conflicts for merge of
5ec66d15 to jb-mr2-dev-plus-aosp
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
Robert Ly [Wed, 3 Apr 2013 21:06:51 +0000 (14:06 -0700)]
am
ca957508: 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 '
ca957508015e841d5a6a4e582d73c6d779419561':
fix android build number in footer of gms and gcm reference
Ulas Kirazci [Wed, 3 Apr 2013 21:03:22 +0000 (14:03 -0700)]
am
bde274ef: Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
* commit '
bde274ef83b9e22365205a7cd320e13bc53ae625':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
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
Ying Wang [Wed, 3 Apr 2013 19:31:24 +0000 (19:31 +0000)]
Merge "Add OkHttp to the platform."
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
jwilson [Sat, 30 Mar 2013 13:00:01 +0000 (09:00 -0400)]
Add OkHttp to the platform.
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
Scott Main [Tue, 2 Apr 2013 20:59:08 +0000 (13:59 -0700)]
am
248a9dd4: 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
* commit '
248a9dd4c91a4ca9d2410b976eab79521b97d0df':
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: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:28:21 +0000 (10:28 -0700)]
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
The Android Open Source Project [Tue, 2 Apr 2013 15:39:21 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I60878364265a0889aaa0d1f32e709b9a4e632636
Jeff Brown [Tue, 2 Apr 2013 15:24:12 +0000 (08:24 -0700)]
am
dd243370: apicheck: Suppress certain changes in final qualifier.
* commit '
dd243370f509115a9e3bd263dcf31e74ae448bd5':
apicheck: Suppress certain changes in final qualifier.
Wink Saville [Tue, 2 Apr 2013 01:02:06 +0000 (18:02 -0700)]
am
0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '
0262d0f74725f8a165b20eeac323cdd8ca31df03':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Wink Saville [Tue, 2 Apr 2013 00:43:38 +0000 (00:43 +0000)]
Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
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:03:46 +0000 (12:03 -0700)]
am
51f7dcb9: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
* commit '
51f7dcb9adb60c91bf85d3148c841efa2b3a14f2':
Default install path of shared Java library with tag tests
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
Ying Wang [Sat, 30 Mar 2013 02:18:38 +0000 (19:18 -0700)]
am
a1fd8e44: Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
* commit '
a1fd8e44b71a83f2733258b020c4057af3c4046a':
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Ying Wang [Sat, 30 Mar 2013 01:20:27 +0000 (01:20 +0000)]
Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
Ying Wang [Sat, 30 Mar 2013 00:40:14 +0000 (17:40 -0700)]
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
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:44:17 +0000 (10:44 -0700)]
am
59fa08bd: Merge "Switch Indic fonts to Noto" into jb-mr2-dev
* commit '
59fa08bd3c624be9ea06789b70c22b483df612c4':
Switch Indic fonts to Noto
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 Open Source Project [Fri, 29 Mar 2013 16:48:35 +0000 (09:48 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I88a69e508f1bd76db6289d1956f0861701a30391
The Android Automerger [Fri, 29 Mar 2013 00:28:35 +0000 (17:28 -0700)]
JWQ87C