Commit graph

12494 commits

Author SHA1 Message Date
The Android Automerger
72ee0344df merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-08 05:55:29 -07:00
Ying Wang
dd75a03d35 Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
2013-04-05 18:51:32 -07:00
Ying Wang
854be68363 Switch to prebuilt bison
Bug: 8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
2013-04-05 18:02:16 -07:00
Dianne Hackborn
4acd27dfb3 Add new media command to build.
Change-Id: I3c32924b0c6400aa22221646f8e118a66f65f628
2013-04-05 17:05:06 -07:00
The Android Automerger
34145be850 JWR04C 2013-04-05 15:14:45 -07:00
The Android Automerger
05cd2f8ff4 JWR04B 2013-04-04 16:25:30 -07:00
The Android Automerger
cfddab2d5c "JWR04" 2013-04-04 05:57:18 -07:00
The Android Automerger
323b344d76 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-04 05:55:10 -07:00
The Android Automerger
0860d95d2d JWR03B 2013-04-03 17:02:56 -07:00
Robert Ly
ca95750801 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
2013-04-03 14:01:54 -07:00
Robert Ly
f3840a2c2c 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
2013-04-03 13:58:38 -07:00
Robert Ly
99532a5aea 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
2013-04-03 13:56:04 -07:00
Robert Ly
ad027032b1 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
2013-04-03 13:54:00 -07:00
Robert Ly
e046ede535 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
2013-04-03 13:52:06 -07:00
Robert Ly
3eba74ffc1 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
2013-04-03 13:48:35 -07:00
Robert Ly
ddde20b67c Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 2013-04-03 20:38:55 +00:00
Ulas Kirazci
bde274ef83 Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-04-03 13:37:07 -07:00
The Android Automerger
8d47f1f81b "JWR03" 2013-04-03 06:03:57 -07:00
The Android Automerger
996ba4838b merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-03 06:02:06 -07:00
The Android Automerger
4981e545c6 JWR02B 2013-04-02 16:55:26 -07:00
Scott Main
248a9dd4c9 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.
2013-04-02 13:55:59 -07:00
Scott Main
baa0023b9f 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.
2013-04-02 13:51:52 -07:00
Scott Main
2e5602cd62 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.
2013-04-02 13:47:47 -07:00
Scott Main
70174c6783 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.
2013-04-02 13:44:22 -07:00
Scott Main
07e13f7c25 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.
2013-04-02 13:40:05 -07:00
Ben Murdoch
0646fdae67 Fix SDK build.
Ensure that we include the Chromium-WebView resources.

Change-Id: I3f7b4e52ebb59fa6a8952839bb071c7994505b75
2013-04-02 18:20:50 +01:00
The Android Automerger
577e518025 "JWR02" 2013-04-02 09:19:59 -07:00
The Android Automerger
1360a8d963 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-02 09:18:12 -07:00
Scott Main
f614554dae 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
2013-04-01 16:38:11 -07:00
The Android Automerger
6f59ed8551 JWR01B 2013-04-01 16:29:47 -07:00
Jeff Brown
dd243370f5 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
2013-04-01 14:24:49 -07:00
Ying Wang
51f7dcb9ad Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev 2013-04-01 19:00:13 +00:00
The Android Automerger
e75ce2635f JWR01 2013-04-01 05:57:34 -07:00
The Android Automerger
746f433b1c merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-01 05:55:15 -07:00
The Android Automerger
6221e8a202 JWQ87E 2013-03-29 16:18:48 -07:00
The Android Automerger
387e52240d JWQ87D 2013-03-29 14:03:26 -07:00
Raph Levien
59fa08bd3c Merge "Switch Indic fonts to Noto" into jb-mr2-dev 2013-03-29 17:43:08 +00:00
Raph Levien
ddfb58bfde 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
2013-03-29 10:22:31 -07:00
The Android Automerger
bb999c493b JWQ87C 2013-03-28 17:28:35 -07:00
keunyoung
6f79520bf7 Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev 2013-03-29 00:11:23 +00:00
The Android Automerger
2b94d4ee0a JWQ87B 2013-03-28 15:46:28 -07:00
keunyoung
3b4856e842 find pdk platform.zip from full_ directory as well for aosp_ products
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
2013-03-28 15:20:38 -07:00
Devin Kim
60b9efc060 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
2013-03-28 14:38:11 -07:00
The Android Automerger
29869913e2 JWQ87 2013-03-28 05:57:57 -07:00
The Android Automerger
5f95fde2eb merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-28 05:55:15 -07:00
Brian Carlstrom
d76ff19a0f Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev 2013-03-28 00:11:20 +00:00
Brian Carlstrom
8c374054b3 resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
2013-03-27 17:04:05 -07:00
Stephen Hines
ffbeac3f47 Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev 2013-03-27 23:59:29 +00:00
Stephen Hines
8db4ccea4a 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
2013-03-27 16:51:38 -07:00
Brian Carlstrom
9a3b17d184 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.
2013-03-27 16:40:25 -07:00